summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-10-10 16:43:55 -0700
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-10-23 08:46:40 -0700
commitd04a2aefb10cdd909b071a9499fad4f013d2e5b8 (patch)
tree32bc0294eae8d15d21c04dbe61d7c3c4385466d3
parent8d47e9f8e13c2ca43520b348dde0424fe6460cc9 (diff)
downloadgitlab-ce-fix-unresolve-btn-jump-color.tar.gz
Fix icon color and btn-group alignment of discussion buttonsfix-unresolve-btn-jump-color
-rw-r--r--app/assets/stylesheets/pages/note_form.scss3
-rw-r--r--app/assets/stylesheets/pages/notes.scss4
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 {