From 7da3eec8e72798b51d3036fe06be017fbd03901e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Tue, 10 Feb 2015 12:24:25 +0100 Subject: [PATCH] Removed unnecesary colors --- app/styles/components/buttons.scss | 15 ++------------- app/styles/components/paginator.scss | 6 +++--- app/styles/components/select-color.scss | 2 +- app/styles/dependencies/colors.scss | 14 -------------- app/styles/layout/base.scss | 2 +- .../modules/admin/admin-membership-table.scss | 2 +- app/styles/modules/admin/admin-roles.scss | 2 +- app/styles/modules/admin/admin-submenu-roles.scss | 2 +- app/styles/modules/admin/admin-submenu.scss | 2 +- app/styles/modules/common/category-config.scss | 2 +- app/styles/modules/team/team-table.scss | 2 +- 11 files changed, 13 insertions(+), 38 deletions(-) diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss index ba919eba..e340990c 100755 --- a/app/styles/components/buttons.scss +++ b/app/styles/components/buttons.scss @@ -41,7 +41,7 @@ button { .button-gray, a.button-gray { - background: $button-gray; + background: $gray; &:hover { background: $fresh-taiga; color: $white; @@ -55,7 +55,7 @@ a.button-blackish { background: $blackish; color: $whitish; &:hover { - background: $button-gray-hover; + background: $blackish; color: $white; } span { @@ -74,17 +74,6 @@ a.button-red { } } -a.button-orange { - background: $orange; - &:hover { - background: lighten($orange, 10%); - color: $white; - } - span { - color: $white; - } -} - a.button-block { background: $white; color: $red; diff --git a/app/styles/components/paginator.scss b/app/styles/components/paginator.scss index 7d4ec1e3..4d8f4ad8 100644 --- a/app/styles/components/paginator.scss +++ b/app/styles/components/paginator.scss @@ -17,7 +17,7 @@ } a { &:hover { - background: $button-gray-hover; + background: $blackish; color: $white; transition: all .3s linear; } @@ -39,7 +39,7 @@ .v-pagination-next, .v-pagination-previous { - background-color: $button-gray; + background-color: $gray; color: $whitish; display: block; padding: .1rem 0; @@ -47,7 +47,7 @@ visibility: hidden; width: 100%; &:hover { - background-color: $button-gray / 2; + background-color: $blackish; transition: background .3s linear; } } diff --git a/app/styles/components/select-color.scss b/app/styles/components/select-color.scss index d8206ea2..b2216cbb 100644 --- a/app/styles/components/select-color.scss +++ b/app/styles/components/select-color.scss @@ -26,7 +26,7 @@ input { @extend %medium; @extend %text; - background-color: $very-light-gray; + background-color: $whitish; width: 243px; @include placeholder { color: $gray; diff --git a/app/styles/dependencies/colors.scss b/app/styles/dependencies/colors.scss index 6b73babd..aeaffb2d 100755 --- a/app/styles/dependencies/colors.scss +++ b/app/styles/dependencies/colors.scss @@ -6,29 +6,15 @@ $grayer: #444; $gray: #555; $gray-light: #b8b8b8; $whitish: #f5f5f5; -$very-light-gray: #fcfcfc; $white: #fff; $green-taiga: #72a114; $fresh-taiga: #9dce0a; $dark-taiga: #879b89; -$dry-taiga: #70a87d; -$morning-taiga: #7ab987; -$dark-grayish-lime-green: #8b9e8d; - $red-light: #ff8282; $red: #f00; -$rgba-red: 240, 15, 0, .8; - -$orange: #d98a0b; - -$button-green: #699b05; -$button-green-hover: #9dce0a; -$button-gray: #585858; -$button-gray-hover: #879b89; - $postit: #fff8e4; $postit-hover: #f1e8cd; $postit-dark-hover: #cfc29b; diff --git a/app/styles/layout/base.scss b/app/styles/layout/base.scss index d192396f..7976e40e 100644 --- a/app/styles/layout/base.scss +++ b/app/styles/layout/base.scss @@ -113,7 +113,7 @@ body { } .menu-tertiary { - background-color: $dark-grayish-lime-green; + background-color: $dark-taiga; flex: 0 0 auto; min-height: 100vh; padding: 2em 1em; diff --git a/app/styles/modules/admin/admin-membership-table.scss b/app/styles/modules/admin/admin-membership-table.scss index 0b296195..820a3232 100644 --- a/app/styles/modules/admin/admin-membership-table.scss +++ b/app/styles/modules/admin/admin-membership-table.scss @@ -116,7 +116,7 @@ width: 500px; z-index: 999; + div { - background-color: $button-gray; + background-color: $gray; height: 25px; transition: all .2s linear; width: 50%; diff --git a/app/styles/modules/admin/admin-roles.scss b/app/styles/modules/admin/admin-roles.scss index 12814b17..58203d80 100644 --- a/app/styles/modules/admin/admin-roles.scss +++ b/app/styles/modules/admin/admin-roles.scss @@ -65,7 +65,7 @@ width: 500px; z-index: 999; + div { - background-color: $button-gray; + background-color: $gray; height: 25px; transition: all .2s linear; width: 50%; diff --git a/app/styles/modules/admin/admin-submenu-roles.scss b/app/styles/modules/admin/admin-submenu-roles.scss index d0b6b5bc..441df1ab 100644 --- a/app/styles/modules/admin/admin-submenu-roles.scss +++ b/app/styles/modules/admin/admin-submenu-roles.scss @@ -38,7 +38,7 @@ padding: .5rem 0; text-align: center; &:hover { - background-color: darken($button-gray-hover, 15%); + background-color: $blackish; } } } diff --git a/app/styles/modules/admin/admin-submenu.scss b/app/styles/modules/admin/admin-submenu.scss index a8524778..6865b220 100644 --- a/app/styles/modules/admin/admin-submenu.scss +++ b/app/styles/modules/admin/admin-submenu.scss @@ -34,7 +34,7 @@ padding: .5rem 0; text-align: center; &:hover { - background-color: darken($button-gray-hover, 15%); + background-color: $blackish; } } } diff --git a/app/styles/modules/common/category-config.scss b/app/styles/modules/common/category-config.scss index 63d4b125..7a9346d3 100644 --- a/app/styles/modules/common/category-config.scss +++ b/app/styles/modules/common/category-config.scss @@ -50,7 +50,7 @@ } .category-item { align-items: center; - border-bottom: 1px solid $very-light-gray; + border-bottom: 1px solid $whitish; display: flex; justify-content: space-between; padding: .5rem .5rem .5rem 2rem; diff --git a/app/styles/modules/team/team-table.scss b/app/styles/modules/team/team-table.scss index 50a9c6b1..5660a6ca 100644 --- a/app/styles/modules/team/team-table.scss +++ b/app/styles/modules/team/team-table.scss @@ -61,7 +61,7 @@ .hero { width: 100%; .row { - background: $very-light-gray; + background: $whitish; border-bottom: 0; margin: 1rem 0; }