diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-09-27 21:08:16 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-09-27 21:08:16 +0000 |
| commit | 79498893832db7a88e07d8f3e7a629944c80705b (patch) | |
| tree | d9f834ed9fd090dbf760999773e92874dbc85984 | |
| parent | e13a3c71c425e8a49ff67eca224766ef763ea065 (diff) | |
| parent | 8c677c2d8fa86c3d216e29cdf1cf356a4be36358 (diff) | |
| download | gitlab-ce-79498893832db7a88e07d8f3e7a629944c80705b.tar.gz | |
Merge branch 'pedroms-master-patch-57786' into 'master'
Fix blue, orange, and red colors
See merge request gitlab-org/gitlab-ce!21972
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/pedroms-master-patch-57786.yml | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index f66782ab882..837016db67b 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -55,7 +55,7 @@ $blue-50: #f6fafe; $blue-100: #e4f0fb; $blue-200: #b8d6f4; $blue-300: #73afea; -$blue-400: #2e87e0; +$blue-400: #418cd8; $blue-500: #1f78d1; $blue-600: #1b69b6; $blue-700: #17599c; @@ -67,7 +67,7 @@ $orange-50: #fffaf4; $orange-100: #fff1de; $orange-200: #fed69f; $orange-300: #fdbc60; -$orange-400: #fca121; +$orange-400: #fca429; $orange-500: #fc9403; $orange-600: #de7e00; $orange-700: #c26700; @@ -78,7 +78,7 @@ $orange-950: #592800; $red-50: #fef6f5; $red-100: #fbe5e1; $red-200: #f2b4a9; -$red-300: #e67664; +$red-300: #ea8271; $red-400: #e05842; $red-500: #db3b21; $red-600: #c0341d; diff --git a/changelogs/unreleased/pedroms-master-patch-57786.yml b/changelogs/unreleased/pedroms-master-patch-57786.yml new file mode 100644 index 00000000000..cdf179046aa --- /dev/null +++ b/changelogs/unreleased/pedroms-master-patch-57786.yml @@ -0,0 +1,5 @@ +--- +title: Fix blue, orange, and red color inconsistencies +merge_request: 21972 +author: +type: other |