From 1cc49cf03cdf149fa2ee510bdcc3d82208cdadd0 Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Thu, 7 May 2020 19:28:26 +0200 Subject: [PATCH] Adjust warning-text default theme value --- app/assets/stylesheets/_variables.scss | 2 +- app/views/settings/_theme.haml | 2 +- db/migrate/20200504214933_update_theme_fields.rb | 1 + db/schema.rb | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss index 86000599..b9db8934 100644 --- a/app/assets/stylesheets/_variables.scss +++ b/app/assets/stylesheets/_variables.scss @@ -81,7 +81,7 @@ $avatar-sizes: ( --primary-text: 255, 255, 255; --danger-text: 255, 255, 255; - --warning-text: 255, 255, 255; + --warning-text: 41, 41, 41; --info-text: 255, 255, 255; --success-text: 255, 255, 255; --dark-text: 255, 255, 255; diff --git a/app/views/settings/_theme.haml b/app/views/settings/_theme.haml index 9c4b7160..a394c3ee 100644 --- a/app/views/settings/_theme.haml +++ b/app/views/settings/_theme.haml @@ -90,7 +90,7 @@ .col-sm-6 = f.text_field :warning_color, class: 'color', data: {default: 0xFFC107} .col-sm-6 - = f.text_field :warning_text, class: 'color', data: {default: 0xFFFFFF} + = f.text_field :warning_text, class: 'color', data: {default: 0x292929} .col-sm-12 .alert.alert-warning A simple warning alert—check it out! diff --git a/db/migrate/20200504214933_update_theme_fields.rb b/db/migrate/20200504214933_update_theme_fields.rb index 015f5969..ec577f1d 100644 --- a/db/migrate/20200504214933_update_theme_fields.rb +++ b/db/migrate/20200504214933_update_theme_fields.rb @@ -34,6 +34,7 @@ class UpdateThemeFields < ActiveRecord::Migration[5.2] change_column_default :themes, :background_color, 0xF0EDF4 change_column_default :themes, :danger_color, 0xDC3545 change_column_default :themes, :warning_color, 0xFFC107 + change_column_default :themes, :warning_text, 0x292929 change_column_default :themes, :info_color, 0x17A2B8 change_column_default :themes, :success_color, 0x28A745 change_column_default :themes, :input_color, 0xF0EDF4 diff --git a/db/schema.rb b/db/schema.rb index b0275eb9..0c1e34b5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -197,7 +197,7 @@ ActiveRecord::Schema.define(version: 2020_05_04_214933) do t.integer "success_color", default: 2664261 t.integer "success_text", default: 16777215 t.integer "warning_color", default: 16761095 - t.integer "warning_text", default: 16777215 + t.integer "warning_text", default: 2697513 t.integer "info_color", default: 1548984 t.integer "info_text", default: 16777215 t.integer "dark_color", default: 3422784