diff options
Diffstat (limited to 'app/assets/stylesheets/pages/merge_conflicts.scss')
-rw-r--r-- | app/assets/stylesheets/pages/merge_conflicts.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index 278a9014458..9d583dcaa52 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -240,14 +240,14 @@ $colors: ( right: 10px; padding: 0; outline: none; - color: $white-light; + color: $white; width: 75px; // static width to make 2 buttons have same width height: 19px; } } .btn-success .fa-spinner { - color: $white-light; + color: $white; } .editor-wrap { |