From 81eb6e8b9edd2689ea2d77f52a5d9c61c0b0e897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 8 Apr 2015 08:27:32 +0200 Subject: [PATCH] Refactor color variables thorgh the app --- app/styles/dependencies/colors.scss | 22 ++++++------------- app/styles/layout/elements.scss | 4 ++-- app/styles/layout/invitation.scss | 2 +- app/styles/layout/typography.scss | 2 +- .../modules/admin/admin-functionalities.scss | 2 +- .../modules/admin/admin-membership-table.scss | 2 +- app/styles/modules/admin/admin-roles.scss | 2 +- .../modules/admin/admin-submenu-roles.scss | 2 +- app/styles/modules/admin/admin-submenu.scss | 2 +- app/styles/modules/wiki/wiki-nav.scss | 2 +- 10 files changed, 17 insertions(+), 25 deletions(-) diff --git a/app/styles/dependencies/colors.scss b/app/styles/dependencies/colors.scss index 662d23ec..85fa352b 100755 --- a/app/styles/dependencies/colors.scss +++ b/app/styles/dependencies/colors.scss @@ -5,21 +5,9 @@ $blackish: #050505; $grayer: #444; $gray: #555; $gray-light: #b8b8b8; -$gray-tower-gray: #a6b2a7; -$gray-saltpan: #e9f0da; -$gray-silver: #cdcdcd; -$gray46-47: #777; -$gray60: #999; -$gray80: #ccc; -$gray87-88: #ddd; -$gray-mine-shaft: #232323; $whitish: #f5f5f5; $white: #fff; -$green-japanese-laurel: #237400; -$green-olive: #618000; -$green-christi: #74a218; - $green-taiga: #72a114; $fresh-taiga: #9dce0a; $dark-taiga: #879b89; @@ -27,10 +15,14 @@ $dark-taiga: #879b89; $red-light: #ff8282; $red: #f00; +$postit: #fff8e4; +$postit-hover: #f1e8cd; +$postit-dark-hover: #cfc29b; + +//Loading bar +$green-japanese-laurel: #237400; +$green-olive: #618000; $red-amaranth: #e43050; $purple-eggplant: #810061; $yellow-pear: #bbe831; -$postit: #fff8e4; -$postit-hover: #f1e8cd; -$postit-dark-hover: #cfc29b; diff --git a/app/styles/layout/elements.scss b/app/styles/layout/elements.scss index 8f98716f..965dedeb 100644 --- a/app/styles/layout/elements.scss +++ b/app/styles/layout/elements.scss @@ -3,12 +3,12 @@ // Blockquotes blockquote, blockquote p { - color: $gray46-47; + color: $gray; font-style: italic; line-height: 24px; } blockquote { - border-left: 1px solid $gray87-88; + border-left: 1px solid $gray-light; margin: 0 0 20px; padding: 9px 20px 0 19px; cite { diff --git a/app/styles/layout/invitation.scss b/app/styles/layout/invitation.scss index afa8a95a..d11889f4 100644 --- a/app/styles/layout/invitation.scss +++ b/app/styles/layout/invitation.scss @@ -100,7 +100,7 @@ text-align: center; width: 200px; .form-header { - color: $gray60; + color: $gray-light; } } .register-form { diff --git a/app/styles/layout/typography.scss b/app/styles/layout/typography.scss index bf4f9279..5dae2378 100755 --- a/app/styles/layout/typography.scss +++ b/app/styles/layout/typography.scss @@ -80,7 +80,7 @@ strong { } hr { - border: solid $gray87-88; + border: solid $blackish; border-width: 1px 0 0; clear: both; height: 0; diff --git a/app/styles/modules/admin/admin-functionalities.scss b/app/styles/modules/admin/admin-functionalities.scss index 0e7f55cb..7f0a9d2d 100644 --- a/app/styles/modules/admin/admin-functionalities.scss +++ b/app/styles/modules/admin/admin-functionalities.scss @@ -19,7 +19,7 @@ vertical-align: top; width: 32%; &.active { - background-color: $gray-saltpan; + background-color: rgba($green-taiga, .3); opacity: 1; } .icon { diff --git a/app/styles/modules/admin/admin-membership-table.scss b/app/styles/modules/admin/admin-membership-table.scss index b7926d84..1e93696d 100644 --- a/app/styles/modules/admin/admin-membership-table.scss +++ b/app/styles/modules/admin/admin-membership-table.scss @@ -139,7 +139,7 @@ } input:checked { + div { - background-color: $green-christi; + background-color: $fresh-taiga; margin-left: 50%; transition: all .2s linear; } diff --git a/app/styles/modules/admin/admin-roles.scss b/app/styles/modules/admin/admin-roles.scss index 8d6eaf2c..9ef79125 100644 --- a/app/styles/modules/admin/admin-roles.scss +++ b/app/styles/modules/admin/admin-roles.scss @@ -104,7 +104,7 @@ input:disabled { cursor: auto; + div { - background-color: $gray80; + background-color: $gray-light; } } } diff --git a/app/styles/modules/admin/admin-submenu-roles.scss b/app/styles/modules/admin/admin-submenu-roles.scss index 7f7ddde9..e9cb013c 100644 --- a/app/styles/modules/admin/admin-submenu-roles.scss +++ b/app/styles/modules/admin/admin-submenu-roles.scss @@ -6,7 +6,7 @@ li { @extend %larger; @extend %title; - border-bottom: 1px solid $gray-tower-gray; + border-bottom: 1px solid $gray-light; text-transform: uppercase; &:last-child { border-bottom: 0; diff --git a/app/styles/modules/admin/admin-submenu.scss b/app/styles/modules/admin/admin-submenu.scss index 39124b18..b404d12f 100644 --- a/app/styles/modules/admin/admin-submenu.scss +++ b/app/styles/modules/admin/admin-submenu.scss @@ -6,7 +6,7 @@ li { @extend %larger; @extend %title; - border-bottom: 1px solid $gray-tower-gray; + border-bottom: 1px solid $gray-light; text-transform: uppercase; &:last-child { border-bottom: 0; diff --git a/app/styles/modules/wiki/wiki-nav.scss b/app/styles/modules/wiki/wiki-nav.scss index bb1e227a..39c20db9 100644 --- a/app/styles/modules/wiki/wiki-nav.scss +++ b/app/styles/modules/wiki/wiki-nav.scss @@ -2,7 +2,7 @@ li { @extend %large; @extend %title; - border-bottom: 1px solid $gray-silver; + border-bottom: 1px solid $gray-light; text-transform: uppercase; &:hover { .icon {