diff options
| author | Phil Hughes <me@iamphill.com> | 2017-10-24 08:23:11 +0000 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2017-10-24 12:39:23 +0000 |
| commit | 73e40d759425c6140b8162f38e323c449ec4808c (patch) | |
| tree | 4544ade8e8bacccd31e714a1c2eff5a4d8ac0d7c /app | |
| parent | aaf8547e222bd5c3d98083c83c707b99ce17642d (diff) | |
| download | gitlab-ce-73e40d759425c6140b8162f38e323c449ec4808c.tar.gz | |
Merge branch 'fix-unresolve-btn-jump-color' into 'master'
Fix code review discussion action buttons
Closes #38891
See merge request gitlab-org/gitlab-ce!14801
(cherry picked from commit a811704c115118fff76046c9307224d41901185a)
d04a2aef Fix icon color and btn-group alignment of discussion buttons
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 04b132415eb..f0cad30f4f3 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -249,13 +249,12 @@ width: 100%; padding-right: 5px; } - } .discussion-actions { display: table; - .new-issue-for-discussion path { + .btn-default path { fill: $gray-darkest; } diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 96b7db3b85d..36a7fc0d3e1 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -466,6 +466,10 @@ ul.notes { float: right; margin-left: 10px; color: $gray-darkest; + + .btn-group > .discussion-next-btn { + margin-left: -1px; + } } .note-actions { |