diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-12 16:26:21 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-13 13:13:53 -0600 |
| commit | 0b72554c1bb47c88361f9fbc6185f49767337368 (patch) | |
| tree | 68786bac6940cc8660d28a8279d8e3eeb93aa041 /app/assets/stylesheets/pages/merge_conflicts.scss | |
| parent | e4a000478f327885fd9dcbc7d47ba77045cef139 (diff) | |
| download | gitlab-ce-0b72554c1bb47c88361f9fbc6185f49767337368.tar.gz | |
Finish refactoring graysvariables
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 7a90713dd3f..5a9f199fb34 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -274,7 +274,7 @@ $colors: ( } .discard-changes-alert { - background-color: $background-color; + background-color: $gray-light; text-align: right; padding: $gl-padding-top $gl-padding; color: $gl-text-color; |