diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-02 15:23:55 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:46 +0300 |
| commit | 76cd67b0052ddf68ece6edef174755d0e3b4aa8a (patch) | |
| tree | 63bbe8f00c1928df3726b98845494c2901b4c64e /app/assets/stylesheets/pages/merge_conflicts.scss | |
| parent | 8b6a075e6ff3197ee984c3d21395e1e26bc3bb15 (diff) | |
Make SCSS lint and RuboCop happy
Diffstat (limited to 'app/assets/stylesheets/pages/merge_conflicts.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_conflicts.scss | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index fe81ce2eb67..a0309113054 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -8,7 +8,7 @@ $origin_gutter: #e0f0ff; $selected_origin_gutter: #a3d3ff; $selected_origin_line: #cee4f9; -$unselected_gutter: #eeeeee; +$unselected_gutter: #eee; $unselected_line: #f8f8f8; @@ -93,8 +93,8 @@ $unselected_line: #f8f8f8; button { border-radius: 4px; - border: 1px solid #E1E1E1; - background: #FFF; + border: 1px solid #e1e1e1; + background: #fff; font-size: 10px; position: absolute; right: 20px; |