summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-14 14:28:58 +0100
committerDouwe Maan <douwe@selenight.nl>2016-07-24 13:12:58 -0600
commitc1fe066b4b0d822950ec67179c11ca19f3de5dd6 (patch)
tree2957ce09f45361510d23c02834ec536c0893adad /app/assets/stylesheets/pages
parent43131802a97da44bcef0f9c54e0724b9af62a206 (diff)
downloadgitlab-ce-c1fe066b4b0d822950ec67179c11ca19f3de5dd6.tar.gz
Added resolve button to discussions
Top count displays how many resolved discussions
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r--app/assets/stylesheets/pages/note_form.scss21
1 files changed, 21 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 3784010348a..a355d802973 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -156,6 +156,27 @@
.discussion-reply-holder {
background-color: $white-light;
padding: 10px 16px;
+
+ .btn-group-justified {
+ table-layout: auto;
+ }
+
+ .btn-group:first-child {
+ width: 100%;
+ }
+
+ .discussion-with-resolve-btn {
+ .btn-group:first-child .btn {
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+ }
+
+ .btn-group:last-child .btn {
+ margin-left: -1px;
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
+ }
+ }
}
}