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

Conflicts:
	modules/base/tool.go

1 files changed, 41 insertions, 0 deletions

diff --git a/public/ng/less/ui/label.less b/public/ng/less/ui/label.less
new file mode 100644
index 0000000000..1cf0a81d85
--- /dev/null
+++ b/public/ng/less/ui/label.less
@@ -0,0 +1,41 @@
+@import "var";
+
+.label {
+  padding: 2px 6px;
+  color: @labelFontColor;
+}
+
+.label-red {
+  background-color: @labelRedColor;
+}
+
+.label-blue {
+  background-color: @labelBlueColor;
+}
+
+.label-gray {
+  background-color: @labelGrayColor;
+}
+
+.label-green {
+  background-color: @labelGreenColor;
+}
+
+.label-orange {
+  background-color: @labelOrangeColor;
+}
+
+.label-black {
+  background-color: @labelBlackColor;
+}
+
+.label-radius{
+  border-radius: .2em;
+}
+
+.label-link{
+  color: @labelFontColor;
+  &:hover{
+    color: @labelFontColor;
+  }
+}
\ No newline at end of file