Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281

Conflicts:
	modules/base/tool.go

1 files changed, 47 insertions, 0 deletions

diff --git a/public/ng/less/ui/alert.less b/public/ng/less/ui/alert.less
new file mode 100644
index 00000000..a52bc7f9
--- /dev/null
+++ b/public/ng/less/ui/alert.less
@@ -0,0 +1,47 @@
+@import "var";
+
+.alert{
+  padding: .6em 1.5em;
+  margin-bottom: 10px;
+  i{
+    margin-right: 8px;
+  }
+}
+
+.alert-radius{
+  border-radius: .25em;
+}
+
+.alert-red{
+  color: @alertRedColor;
+  border: 1px solid darken(@alertRedColor,10%);
+  background-color: lighten(@alertRedColor,40%);
+}
+
+.alert-blue{
+  color: @alertBlueColor;
+  border: 1px solid darken(@alertBlueColor,10%);
+  background-color: lighten(@alertBlueColor,45%);
+}
+
+.alert-green{
+  color: @alertGreenColor;
+  border: 1px solid darken(@alertGreenColor,10%);
+  background-color: lighten(@alertGreenColor,45%);
+}
+
+.alert-gray{
+  color: @alertGrayColor;
+  border: 1px solid darken(@alertGrayColor,10%);
+  background-color: lighten(@alertGrayColor,35%);
+}
+
+.alert-orange{
+  color: @alertOrangeColor;
+  border: 1px solid darken(@alertOrangeColor,10%);
+  background-color: lighten(@alertOrangeColor,45%);
+}
+
+
+
+