nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use darker version creation-blue and creation-green for brand-primary and brand-success

Browse source
This commit is contained in:
Steffen van Bergerem 2015-06-04 02:43:16 +02:00 committed by Jonne Haß
parent f5bb4a4557
commit a3725599ef
6 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/bootstrap-variables.scss vendored
View file

@ -16,8 +16,8 @@
// $gray-light: lighten($gray-base, 46.7%) // #777 // $gray-light: lighten($gray-base, 46.7%) // #777
// $gray-lighter: lighten($gray-base, 93.5%) // #eee // $gray-lighter: lighten($gray-base, 93.5%) // #eee
// $brand-primary: darken(#428bca, 6.5%) // #337ab7 $brand-primary: darken(#0097FF,5%); // darker creation-blue
// $brand-success: #5cb85c $brand-success: #8EDE3D;
// $brand-info: #5bc0de // $brand-info: #5bc0de
// $brand-warning: #f0ad4e // $brand-warning: #f0ad4e
// $brand-danger: #d9534f // $brand-danger: #d9534f
@ -158,7 +158,7 @@ $font-size-base: 13px;
// $btn-primary-bg: $brand-primary // $btn-primary-bg: $brand-primary
// $btn-primary-border: darken($btn-primary-bg, 5%) // $btn-primary-border: darken($btn-primary-bg, 5%)
// $btn-success-color: #fff $btn-success-color: #333;
// $btn-success-bg: $brand-success // $btn-success-bg: $brand-success
// $btn-success-border: darken($btn-success-bg, 5%) // $btn-success-border: darken($btn-success-bg, 5%)

1
app/assets/stylesheets/colors.scss
View file

@ -24,7 +24,6 @@ $light-green: lighten($green,20%);
$red: #A80000; $red: #A80000;
$blue: #3F8FBA; $blue: #3F8FBA;
$dark-blue: darken(#0984C8,10%); $dark-blue: darken(#0984C8,10%);
$creation-blue: #0097FF;
/* colors : http://www.colourlovers.com/palette/2134203/Awezome_in_argyle */ /* colors : http://www.colourlovers.com/palette/2134203/Awezome_in_argyle */
$cyan : rgb(8,204,249); $cyan : rgb(8,204,249);

4
app/assets/stylesheets/contacts.scss
View file

@ -47,8 +47,8 @@
&:hover { color: $black; } &:hover { color: $black; }
} }
&.in_aspect { &.in_aspect {
border-left: 3px solid $green; border-left: 3px solid $brand-success;
background-color: lighten($green,35%); background-color: lighten($brand-success,35%);
} }
&:not(.in_aspect) { border-left: 3px solid $white; } &:not(.in_aspect) { border-left: 3px solid $white; }
} }

2
app/assets/stylesheets/new_styles/_statistics.scss
View file

@ -4,7 +4,7 @@
h3{ h3{
margin: 0px; margin: 0px;
padding: 10px; padding: 10px;
background-color: $green; background-color: $brand-success;
} }
.span-3 { .span-3 {

4
app/assets/stylesheets/profile.scss
View file

@ -32,7 +32,7 @@
color: $text-grey; color: $text-grey;
&:before { content: '\26aa'; } &:before { content: '\26aa'; }
} }
&.entypo.check { color: darken($green,20%); } &.entypo.check { color: darken($brand-success,20%); }
} }
.description { .description {
margin-bottom: 20px; margin-bottom: 20px;
@ -78,7 +78,7 @@
> li { > li {
display: inline-block; display: inline-block;
&.active { &.active {
border-bottom: 3px solid $creation-blue; border-bottom: 3px solid $brand-primary;
a { a {
color: $black; color: $black;
.entypo { color: $black; } .entypo { color: $black; }

6
app/assets/stylesheets/stream_element.scss
View file

@ -134,11 +134,11 @@
&.highlighted { &.highlighted {
padding-left: 8px; padding-left: 8px;
border-left: 3px solid $creation-blue; border-left: 3px solid $brand-primary;
} }
&.post_preview { &.post_preview {
background-color: lighten($creation-blue,45%); background-color: lighten($brand-primary,45%);
border: 1px solid $creation-blue; border: 1px solid $brand-primary;
} }
} }