diff --git a/app/assets/stylesheets/bootstrap-variables.scss b/app/assets/stylesheets/bootstrap-variables.scss index 3d63906b8..220de7495 100644 --- a/app/assets/stylesheets/bootstrap-variables.scss +++ b/app/assets/stylesheets/bootstrap-variables.scss @@ -16,8 +16,8 @@ // $gray-light: lighten($gray-base, 46.7%) // #777 // $gray-lighter: lighten($gray-base, 93.5%) // #eee -// $brand-primary: darken(#428bca, 6.5%) // #337ab7 -// $brand-success: #5cb85c +$brand-primary: darken(#0097FF,5%); // darker creation-blue +$brand-success: #8EDE3D; // $brand-info: #5bc0de // $brand-warning: #f0ad4e // $brand-danger: #d9534f @@ -158,7 +158,7 @@ $font-size-base: 13px; // $btn-primary-bg: $brand-primary // $btn-primary-border: darken($btn-primary-bg, 5%) -// $btn-success-color: #fff +$btn-success-color: #333; // $btn-success-bg: $brand-success // $btn-success-border: darken($btn-success-bg, 5%) diff --git a/app/assets/stylesheets/colors.scss b/app/assets/stylesheets/colors.scss index caa7fa90c..272821cc7 100644 --- a/app/assets/stylesheets/colors.scss +++ b/app/assets/stylesheets/colors.scss @@ -24,7 +24,6 @@ $light-green: lighten($green,20%); $red: #A80000; $blue: #3F8FBA; $dark-blue: darken(#0984C8,10%); -$creation-blue: #0097FF; /* colors : http://www.colourlovers.com/palette/2134203/Awezome_in_argyle */ $cyan : rgb(8,204,249); diff --git a/app/assets/stylesheets/contacts.scss b/app/assets/stylesheets/contacts.scss index 9a356689d..25044f66c 100644 --- a/app/assets/stylesheets/contacts.scss +++ b/app/assets/stylesheets/contacts.scss @@ -47,8 +47,8 @@ &:hover { color: $black; } } &.in_aspect { - border-left: 3px solid $green; - background-color: lighten($green,35%); + border-left: 3px solid $brand-success; + background-color: lighten($brand-success,35%); } &:not(.in_aspect) { border-left: 3px solid $white; } } diff --git a/app/assets/stylesheets/new_styles/_statistics.scss b/app/assets/stylesheets/new_styles/_statistics.scss index 446b19a4d..26bb1f9b7 100644 --- a/app/assets/stylesheets/new_styles/_statistics.scss +++ b/app/assets/stylesheets/new_styles/_statistics.scss @@ -4,7 +4,7 @@ h3{ margin: 0px; padding: 10px; - background-color: $green; + background-color: $brand-success; } .span-3 { diff --git a/app/assets/stylesheets/profile.scss b/app/assets/stylesheets/profile.scss index ce915c30e..a598b4bf9 100644 --- a/app/assets/stylesheets/profile.scss +++ b/app/assets/stylesheets/profile.scss @@ -32,7 +32,7 @@ color: $text-grey; &:before { content: '\26aa'; } } - &.entypo.check { color: darken($green,20%); } + &.entypo.check { color: darken($brand-success,20%); } } .description { margin-bottom: 20px; @@ -78,7 +78,7 @@ > li { display: inline-block; &.active { - border-bottom: 3px solid $creation-blue; + border-bottom: 3px solid $brand-primary; a { color: $black; .entypo { color: $black; } diff --git a/app/assets/stylesheets/stream_element.scss b/app/assets/stylesheets/stream_element.scss index e18880c54..f084e0e51 100644 --- a/app/assets/stylesheets/stream_element.scss +++ b/app/assets/stylesheets/stream_element.scss @@ -134,11 +134,11 @@ &.highlighted { padding-left: 8px; - border-left: 3px solid $creation-blue; + border-left: 3px solid $brand-primary; } &.post_preview { - background-color: lighten($creation-blue,45%); - border: 1px solid $creation-blue; + background-color: lighten($brand-primary,45%); + border: 1px solid $brand-primary; } }