summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-12-27 15:30:42 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-12-27 15:30:42 +0000
commitf264ec6ee74a0263b4e5212e921c4638c25f8fcd (patch)
tree3ecb5cca5453c406013be85b5043bc0ed320f78c
parent20afb4c69ee91a91094eed2bffd566c5bca1ce0d (diff)
parenta548b70851813f71c57da59769fade9495a0d2a9 (diff)
downloadgitlab-ce-f264ec6ee74a0263b4e5212e921c4638c25f8fcd.tar.gz
Merge branch 'resolve-note-svg-color' into 'master'
Fixed discussion note resolve button SVG color See merge request !8250
-rw-r--r--app/assets/stylesheets/pages/notes.scss8
-rw-r--r--changelogs/unreleased/resolve-note-svg-color.yml4
2 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index b512da0939f..8f15775ee03 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -557,18 +557,14 @@ ul.notes {
&.is-active {
color: $gl-text-green;
- svg path {
+ svg {
fill: $gl-text-green;
}
}
svg {
position: relative;
- color: $gray-darkest;
-
- path {
- fill: $gray-darkest;
- }
+ fill: $gray-darkest;
}
}
diff --git a/changelogs/unreleased/resolve-note-svg-color.yml b/changelogs/unreleased/resolve-note-svg-color.yml
new file mode 100644
index 00000000000..500d4e9d5b1
--- /dev/null
+++ b/changelogs/unreleased/resolve-note-svg-color.yml
@@ -0,0 +1,4 @@
+---
+title: Fixed resolve discussion note button color
+merge_request:
+author: