diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-08-19 18:39:18 +0300 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-08-28 18:02:27 +0300 |
| commit | 764ef25c1145fc46a929b37d90423181bc295aa5 (patch) | |
| tree | e7c9efb4673d8548c74df87a3036654ccc454a64 /app/assets/stylesheets/pages/merge_conflicts.scss | |
| parent | 68b3c8c2973a8fe1ee3f51091394acef2a25789d (diff) | |
Remove #faf9f9 and #f9f9f9 from color palette; replace with #fafafa
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 1f499897c16..5ec660799e3 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -16,7 +16,7 @@ $colors: ( white_button_origin_chosen : #268ced, white_header_not_chosen : #f0f0f0, - white_line_not_chosen : #f9f9f9, + white_line_not_chosen : $gray-light, dark_header_head_neutral : rgba(#3f3, .2), |