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

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Dennis Schubert 2016-09-25 03:26:26 +02:00
commit 89bf1aeb4b
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
7 changed files with 3 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/stylesheets/color_themes/dark_green/_style.scss
View file

@ -3,16 +3,11 @@ $brand-primary: #009900;
/* Shades */
$main-color-essence: fade-out($brand-primary, 0.8);
$main-color-light: lighten($brand-primary, 10%);
$main-color-dark: darken($brand-primary, 20%);
/* Bootstrap Variables */
$btn-primary-bg: $brand-primary;
$link-color: $brand-primary;
/* Custom Variables */
$header-background-color: $main-color-dark;
$navbar-inverse-bg: $main-color-dark;
$header-search-color: lighten($header-background-color, 10%);
@import "color_themes/color_theme_override"
@import 'color_themes/color_theme_override';

7
app/assets/stylesheets/color_themes/egyptian_blue/_style.scss
View file

@ -3,16 +3,11 @@ $brand-primary: #1034A6;
/* Shades */
$main-color-essence: fade-out($brand-primary, 0.8);
$main-color-light: lighten($brand-primary, 10%);
$main-color-dark: darken($brand-primary, 15%);
/* Bootstrap Variables */
$btn-primary-bg: $brand-primary;
$link-color: $brand-primary;
/* Custom Variables */
$header-background-color: $main-color-dark;
$navbar-inverse-bg: $main-color-dark;
$header-search-color: lighten($header-background-color, 15%);
@import "color_themes/color_theme_override"
@import 'color_themes/color_theme_override';

7
app/assets/stylesheets/color_themes/magenta/_style.scss
View file

@ -3,16 +3,11 @@ $brand-primary: #FF00FF;
/* Shades */
$main-color-essence: fade-out($brand-primary, 0.8);
$main-color-light: lighten($brand-primary, 10%);
$main-color-dark: darken($brand-primary, 30%);
/* Bootstrap Variables */
$btn-primary-bg: darken($brand-primary, 5%);
$link-color: $brand-primary;
/* Custom Variables */
$header-background-color: $main-color-dark;
$navbar-inverse-bg: $main-color-dark;
$header-search-color: lighten($header-background-color, 10%);
@import "color_themes/color_theme_override"
@import 'color_themes/color_theme_override';

8
app/assets/stylesheets/color_themes/original/_style.scss
View file

@ -1,8 +0,0 @@
/* Main color(s) */
$main-color: #585858;
/* Shades */
$main-color-dark: darken($main-color, 15%);
/* Variables */
$header-background-color: $main-color-dark;

1
app/assets/stylesheets/color_themes/original/desktop.scss
View file

@ -1,2 +1 @@
@import "style";
@import "application";

1
app/assets/stylesheets/color_themes/original/mobile.scss
View file

@ -1,2 +1 @@
@import "style";
@import "mobile/mobile";

5
app/assets/stylesheets/color_themes/original_white/_style.scss
View file

@ -1,12 +1,7 @@
// Main color(s)
$main-color: #585858;
$background: #fff;
// Shades
$main-color-dark: darken($main-color, 15%);
// Variables
$header-background-color: $main-color-dark;
$main-background: $background;
$sidebars-background: $background;
$card-shadow: none;