summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-13 14:43:46 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-13 14:43:46 +0300
commit1f1c59b61d30b76d69f0f925b43a0b96465f38ed (patch)
tree3e77115afc63a5d571798d4dda23f9f30e0a49b5 /app/assets
parent0c621708658da4b3cf88d805da5dbad920f3d27f (diff)
parent5f25cdfe19c7c0a8c1ada592307e9017e2a754e1 (diff)
downloadgitlab-ce-1f1c59b61d30b76d69f0f925b43a0b96465f38ed.tar.gz
Merge pull request #6778 from dblessing/feature/mr_labels
Merge Request Labels
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/sections/merge_requests.scss8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss
index 5dcfc449b42..2d9a5e4bbe6 100644
--- a/app/assets/stylesheets/sections/merge_requests.scss
+++ b/app/assets/stylesheets/sections/merge_requests.scss
@@ -73,6 +73,10 @@
.merge-request-info {
color: #999;
+
+ .merge-request-labels {
+ display: inline-block;
+ }
}
}
}
@@ -111,3 +115,7 @@
}
}
}
+
+.merge-request-show-labels .label {
+ padding: 6px 10px;
+}