From 0b72554c1bb47c88361f9fbc6185f49767337368 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Mon, 12 Dec 2016 16:26:21 -0600 Subject: Finish refactoring grays --- app/assets/stylesheets/pages/merge_conflicts.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/assets/stylesheets/pages/merge_conflicts.scss') 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; -- cgit v1.2.1