summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-05-22 15:13:08 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-05-22 15:13:08 +0000
commit95c2791be39af907aea695b007fe0ef44a1d7421 (patch)
tree46c1048465be789d39c87f97878195b827e59068
parent454cbac3ef1b72ad8f9f70aecc7e8e9b9aba3f7a (diff)
parent79e5a09c71e20fd2ba7c166c003f2f17b6e80c46 (diff)
downloadgitlab-ce-95c2791be39af907aea695b007fe0ef44a1d7421.tar.gz
Merge branch '62061-note-icon-color' into 'master'
Update note actions icon color Closes #62061 See merge request gitlab-org/gitlab-ce!28498
-rw-r--r--app/assets/stylesheets/framework/mixins.scss4
-rw-r--r--app/assets/stylesheets/pages/notes.scss2
-rw-r--r--changelogs/unreleased/62061-note-icon-color.yml5
3 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index 18eb10c1f23..97de0c98325 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -325,8 +325,8 @@
line-height: 1;
padding: 0;
min-width: 16px;
- color: $gray-darkest;
- fill: $gray-darkest;
+ color: $gray-600;
+ fill: $gray-600;
.fa {
position: relative;
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index fcb57db590a..50c87e55f56 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -645,7 +645,7 @@ $note-form-margin-left: 72px;
display: inline-flex;
align-items: center;
margin-left: 10px;
- color: $gray-darkest;
+ color: $gray-600;
@include notes-media('max', map-get($grid-breakpoints, sm) - 1) {
float: none;
diff --git a/changelogs/unreleased/62061-note-icon-color.yml b/changelogs/unreleased/62061-note-icon-color.yml
new file mode 100644
index 00000000000..5bfea1a9ed3
--- /dev/null
+++ b/changelogs/unreleased/62061-note-icon-color.yml
@@ -0,0 +1,5 @@
+---
+title: Update icon color to match design system, pass accessibility
+merge_request: 28498
+author: Jarek Ostrowski @jareko
+type: fixed