diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-22 22:34:04 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-22 22:34:04 +0000 |
| commit | 1af9dfb8a8b163d70a8631a6cbb564709d5a3730 (patch) | |
| tree | c1b2d868d17044308afd5bbd84248701cf8604be | |
| parent | 0068c4498a8a41156450b900232ddfb9766fb610 (diff) | |
| parent | ad61ba45e34b34461e6fb6f265e2216ccea449c1 (diff) | |
| download | gitlab-ce-1af9dfb8a8b163d70a8631a6cbb564709d5a3730.tar.gz | |
Merge branch 'time-tracking-color-not-consistent' into 'master'
Corrected the color from the time tracking icon in the issuable sidebar
Closes #29588
See merge request !10160
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/time-tracking-color-not-consistent.yml | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 6841adb637e..f2753dd0ac2 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -84,7 +84,6 @@ $warning-message-border: #f0e2bb; */ $border-color: #e5e5e5; $focus-border-color: #3aabf0; -$sidebar-collapsed-icon-color: #999; $well-expand-item: #e8f2f7; $well-inner-border: #eef0f2; $well-light-border: #f1f1f1; diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 4426169ef5a..ddc0e78c7b6 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -498,7 +498,7 @@ svg { width: 16px; height: 16px; - fill: $sidebar-collapsed-icon-color; + fill: $issuable-sidebar-color; } &:hover svg { diff --git a/changelogs/unreleased/time-tracking-color-not-consistent.yml b/changelogs/unreleased/time-tracking-color-not-consistent.yml new file mode 100644 index 00000000000..50ec9efb1ff --- /dev/null +++ b/changelogs/unreleased/time-tracking-color-not-consistent.yml @@ -0,0 +1,4 @@ +--- +title: Corrected time tracking icon color in the issuable side bar +merge_request: +author: |