diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-25 19:48:58 +0300 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-25 19:48:58 +0300 |
| commit | 142bbd900b791478b2ad473efc8e0f78a7afe00d (patch) | |
| tree | c93aa1cf9dbd53da3a5b7dd008509678490951eb /app/assets/stylesheets/pages/notes.scss | |
| parent | fea7b9e68255771a308e9d391079d83c58340814 (diff) | |
| parent | b83dcd3a30539f86b13d91ffd24fb708652eae80 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues
# Conflicts:
# app/assets/javascripts/notes/components/issue_comment_form.vue
Diffstat (limited to 'app/assets/stylesheets/pages/notes.scss')
| -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 f6cc3fd7952..925fe4513ee 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -733,6 +733,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; @@ -747,10 +753,6 @@ ul.notes { border: 0; } } - - .new-issue-for-discussion path { - fill: $gray-darkest; - } } } @@ -823,16 +825,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 |