From 2e9a0d2b4cab4b7e8838df6df66e0be0dcf23845 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sat, 25 Jul 2020 14:22:45 +0300 Subject: [PATCH] New colors to replace the heavy black. --- app/assets/stylesheets/application.scss | 2 ++ app/assets/stylesheets/colors.scss | 6 ++++++ app/assets/stylesheets/legacy.scss | 14 +++++--------- app/assets/stylesheets/login.scss | 2 +- app/assets/stylesheets/tracks.scss | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 app/assets/stylesheets/colors.scss diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index ce2e368d..b6981688 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -28,6 +28,8 @@ } .bootstrap { + @import "colors"; + @import "bootstrap-sprockets"; @import "bootstrap"; @import "tracks-logo"; diff --git a/app/assets/stylesheets/colors.scss b/app/assets/stylesheets/colors.scss new file mode 100644 index 00000000..cb24b296 --- /dev/null +++ b/app/assets/stylesheets/colors.scss @@ -0,0 +1,6 @@ +$gray-lighter: lighten(#000, 93.5%); +$brand-primary: #3C6997; +$navbar-inverse-bg: $brand_primary; +$navbar-inverse-color: $gray-lighter; +$navbar-inverse-link-color: $gray-lighter; + diff --git a/app/assets/stylesheets/legacy.scss b/app/assets/stylesheets/legacy.scss index 9b043021..0063c260 100644 --- a/app/assets/stylesheets/legacy.scss +++ b/app/assets/stylesheets/legacy.scss @@ -75,17 +75,11 @@ p { } a, a:link, a:active, a:visited { - color: #cc3334; text-decoration: none; padding-left: 1px; padding-right: 1px; } -a:hover { - color: #fff; - background-color: #cc3334; -} - h1 { font-size: 304%; font-weight: bold; @@ -820,12 +814,14 @@ form { } #todo_new_action_container, #project_new_project_container, #context_new_container, #recurring_new_container { - background: #ddd; width: 270px; padding: 5px 10px; - background-color: #000; - color: #eee; + background-color: #3C6997; + color: lighten(#000, 93.5%); border-radius: 5px; + a { + color: lighten(#000, 85%); + } } #recurring_new_container img { diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index ee2fa703..49d5d00e 100644 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -21,7 +21,7 @@ body { @include make-sm-column(6); @include make-sm-column-offset(3); margin: 2em auto 1em; - background-color: rgba(0, 0, 0, 0.75); + background-color: $brand-primary; padding: 0 0 1em 0; box-shadow: 0 2px 6px rgba(0, 0, 0, 0.5), 0 2px 3px rgba(0, 0, 0, 0.3); color: #eaeaea; diff --git a/app/assets/stylesheets/tracks.scss b/app/assets/stylesheets/tracks.scss index 2cb3e440..efafa78d 100644 --- a/app/assets/stylesheets/tracks.scss +++ b/app/assets/stylesheets/tracks.scss @@ -1,5 +1,5 @@ .navbar { - /* Shows the number of undone next action */ + /* Shows the count of undone next actions */ .badge { color: #fff; background: #f00;