diff options
author | Phil Hughes <me@iamphill.com> | 2017-09-21 07:20:48 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2017-09-21 15:43:42 -0400 |
commit | ab18d0225cda5a63e8efd07f115c00df850d88cb (patch) | |
tree | c4e40cc5937b4577bc1a8f8592fbd198cf265980 | |
parent | d0fbdaeda62d08d791200832925b168990d64402 (diff) | |
download | gitlab-ce-ab18d0225cda5a63e8efd07f115c00df850d88cb.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.scss | 20 |
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 |