Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Neff <benjamin@coding4coffee.ch>2016-09-25 01:15:32 +0300
committerDennis Schubert <mail@dennis-schubert.de>2016-09-25 04:26:22 +0300
commit89a6379eddc744491868807fdb32804789fc998f (patch)
tree529245877e056f09b7ca479b79306ae1df47750d /app/assets
parentfe5811bb65afaca762d4d3b1a49c1fd154b85b4b (diff)
Cleanup unused variables from color themes
closes #7121
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/color_themes/dark_green/_style.scss7
-rw-r--r--app/assets/stylesheets/color_themes/egyptian_blue/_style.scss7
-rw-r--r--app/assets/stylesheets/color_themes/magenta/_style.scss7
-rw-r--r--app/assets/stylesheets/color_themes/original/_style.scss8
-rw-r--r--app/assets/stylesheets/color_themes/original/desktop.scss1
-rw-r--r--app/assets/stylesheets/color_themes/original/mobile.scss1
-rw-r--r--app/assets/stylesheets/color_themes/original_white/_style.scss5
7 files changed, 3 insertions, 33 deletions
diff --git a/app/assets/stylesheets/color_themes/dark_green/_style.scss b/app/assets/stylesheets/color_themes/dark_green/_style.scss
index f8fe658e7..06cba3530 100644
--- a/app/assets/stylesheets/color_themes/dark_green/_style.scss
+++ b/app/assets/stylesheets/color_themes/dark_green/_style.scss
@@ -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';
diff --git a/app/assets/stylesheets/color_themes/egyptian_blue/_style.scss b/app/assets/stylesheets/color_themes/egyptian_blue/_style.scss
index 1895f02bb..f50cea8a5 100644
--- a/app/assets/stylesheets/color_themes/egyptian_blue/_style.scss
+++ b/app/assets/stylesheets/color_themes/egyptian_blue/_style.scss
@@ -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';
diff --git a/app/assets/stylesheets/color_themes/magenta/_style.scss b/app/assets/stylesheets/color_themes/magenta/_style.scss
index 0f9b4be1f..48d1bcefe 100644
--- a/app/assets/stylesheets/color_themes/magenta/_style.scss
+++ b/app/assets/stylesheets/color_themes/magenta/_style.scss
@@ -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';
diff --git a/app/assets/stylesheets/color_themes/original/_style.scss b/app/assets/stylesheets/color_themes/original/_style.scss
deleted file mode 100644
index 89dda9ca2..000000000
--- a/app/assets/stylesheets/color_themes/original/_style.scss
+++ /dev/null
@@ -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;
diff --git a/app/assets/stylesheets/color_themes/original/desktop.scss b/app/assets/stylesheets/color_themes/original/desktop.scss
index fc325a510..714cf9a78 100644
--- a/app/assets/stylesheets/color_themes/original/desktop.scss
+++ b/app/assets/stylesheets/color_themes/original/desktop.scss
@@ -1,2 +1 @@
-@import "style";
@import "application";
diff --git a/app/assets/stylesheets/color_themes/original/mobile.scss b/app/assets/stylesheets/color_themes/original/mobile.scss
index e8a543736..459d1c719 100644
--- a/app/assets/stylesheets/color_themes/original/mobile.scss
+++ b/app/assets/stylesheets/color_themes/original/mobile.scss
@@ -1,2 +1 @@
-@import "style";
@import "mobile/mobile";
diff --git a/app/assets/stylesheets/color_themes/original_white/_style.scss b/app/assets/stylesheets/color_themes/original_white/_style.scss
index 7f702bcaf..57228dfdf 100644
--- a/app/assets/stylesheets/color_themes/original_white/_style.scss
+++ b/app/assets/stylesheets/color_themes/original_white/_style.scss
@@ -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;