diff options
| author | Pedro Moreira da Silva <pedro@gitlab.com> | 2017-03-23 19:04:25 +0300 |
|---|---|---|
| committer | Pedro Moreira da Silva <pedro@gitlab.com> | 2017-03-23 21:19:17 +0300 |
| commit | c8fd7025565e6a3eb1accabf3e07dd8e2f37b003 (patch) | |
| tree | 26610a60d572bb0ef830015420bde1503bfe1051 /app/assets/stylesheets/pages/merge_conflicts.scss | |
| parent | ed808a9f3477cdb77df3ca62fdddf2640f33653d (diff) | |
Change full colors to a more harmonious palette
Diffstat (limited to 'app/assets/stylesheets/pages/merge_conflicts.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_conflicts.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index 5a9f199fb34..35cefd449f1 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -255,7 +255,7 @@ $colors: ( &.saved { .editor { - border-top: solid 2px $border-green-extra-light; + border-top: solid 2px $green-200; } } |