diff options
| author | Pedro Moreira da Silva <hi@pedroms.com> | 2017-09-23 03:06:18 +0300 |
|---|---|---|
| committer | Pedro Moreira da Silva <hi@pedroms.com> | 2017-09-23 03:06:18 +0300 |
| commit | 7ab056c7d73191cbfb2ce70a2fa19aff69d11fd3 (patch) | |
| tree | b1fa3831602cb2ce7ec8c41215ad42da2fc36937 /app/assets/stylesheets/pages/merge_conflicts.scss | |
| parent | e85e803c0eb6e48dfd9228e718190d95ededf9b1 (diff) | |
Update light colors, remove ’25’ and add ‘950’ shades
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 35cefd449f1..dbf3e2b763c 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 $green-200; + border-top: solid 2px $green-300; } } |