Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-12-27 18:30:42 +0300
committerMarin Jankovski <marin@gitlab.com>2016-12-27 19:42:29 +0300
commit13d640a1122c835555e523209ba64983f7fd2d16 (patch)
tree96dd27ad19c66135a26baa8ded7951000c774a52
parent6aaabf270423f0abb3b9fd496b154adea6d912d5 (diff)
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 6ac4ec6ea0d..c3edf8a65b5 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -566,18 +566,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: