diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-11 17:12:38 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-11 17:12:38 +0000 |
commit | 1621b456e5796695181fc2871c974005e1fd38e0 (patch) | |
tree | a71419e3d0829567d9af70905bf6a0b71631a4d9 | |
parent | efeaf3bd41e60be1405b7e3ccfcfb6cb4747518c (diff) | |
parent | fa68cb3c21c420eee9a801cdf4bdd520949d1782 (diff) | |
download | gitlab-ce-1621b456e5796695181fc2871c974005e1fd38e0.tar.gz |
Merge branch '37660-match-sidebar-colors' into 'master'
37660 Change background color of nav sidebar to match other gl sidebars
Closes #37660
See merge request gitlab-org/gitlab-ce!14800
-rw-r--r-- | app/assets/stylesheets/framework/new-sidebar.scss | 2 | ||||
-rw-r--r-- | changelogs/unreleased/37660-match-sidebar-colors.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/new-sidebar.scss b/app/assets/stylesheets/framework/new-sidebar.scss index caf4c7a40b1..78972717932 100644 --- a/app/assets/stylesheets/framework/new-sidebar.scss +++ b/app/assets/stylesheets/framework/new-sidebar.scss @@ -90,7 +90,7 @@ $new-sidebar-collapsed-width: 50px; top: $header-height; bottom: 0; left: 0; - background-color: $gray-normal; + background-color: $gray-light; box-shadow: inset -2px 0 0 $border-color; transform: translate3d(0, 0, 0); diff --git a/changelogs/unreleased/37660-match-sidebar-colors.yml b/changelogs/unreleased/37660-match-sidebar-colors.yml new file mode 100644 index 00000000000..d5600f453e7 --- /dev/null +++ b/changelogs/unreleased/37660-match-sidebar-colors.yml @@ -0,0 +1,5 @@ +--- +title: Change background color of nav sidebar to match other gl sidebars +merge_request: +author: +type: changed |