summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-09-21 07:20:48 +0000
committerPhil Hughes <me@iamphill.com>2017-09-21 07:20:48 +0000
commit6374530d6d42c95a07822c17bed6c86448a1098b (patch)
treed1ff627a1cfc3996e9cf15e9ef25e2a7ef4cc60f
parent251ed2d405d73c0177668d5a3c730615153e293e (diff)
parent22d930ae807dd62651e7ec5fef59048997bc8c54 (diff)
downloadgitlab-ce-6374530d6d42c95a07822c17bed6c86448a1098b.tar.gz
Merge branch 'resolve-discussions-btn' into 'master'
Make resolve discussion icon gray See merge request gitlab-org/gitlab-ce!14398
-rw-r--r--app/assets/stylesheets/pages/notes.scss20
1 files changed, 6 insertions, 14 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 052c005a2e8..46d31e41ada 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -727,6 +727,12 @@ ul.notes {
border-bottom-left-radius: 0;
}
+ .btn {
+ svg path {
+ fill: $gray-darkest;
+ }
+ }
+
.btn.discussion-create-issue-btn {
margin-left: -4px;
border-radius: 0;
@@ -741,10 +747,6 @@ ul.notes {
border: 0;
}
}
-
- .new-issue-for-discussion path {
- fill: $gray-darkest;
- }
}
}
@@ -817,16 +819,6 @@ ul.notes {
vertical-align: middle;
}
-.discussion-next-btn {
- svg {
- margin: 0;
-
- path {
- fill: $gray-darkest;
- }
- }
-}
-
// Merge request notes in diffs
.diff-file {
// Diff is inline