From d0d3df05eb64b4ad5f42db469572464c22f4e1a5 Mon Sep 17 00:00:00 2001
From: fla <flaburgan@geexxx.fr>
Date: Fri, 29 Jan 2016 16:23:40 +0100
Subject: [PATCH] Fix original white theme

---
 app/assets/stylesheets/color-variables.scss                   | 4 ++--
 .../stylesheets/color_themes/original_white/_style.scss       | 2 +-
 app/assets/stylesheets/navbar_left.scss                       | 3 +--
 app/assets/stylesheets/stream.scss                            | 2 +-
 app/views/tags/show.haml                                      | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/color-variables.scss b/app/assets/stylesheets/color-variables.scss
index a4c9f7e41e..d3862a09d7 100644
--- a/app/assets/stylesheets/color-variables.scss
+++ b/app/assets/stylesheets/color-variables.scss
@@ -26,8 +26,8 @@ $light-green: lighten($green, 20%);
 $red: #a80000;
 $blue: #3f8fba;
 
-$sidebars-background: #f0f0f0 !default;
-$sidebars-sub-background: darken($sidebars-background, 12%) !default;
+$main-background: #f0f0f0 !default;
+$sidebars-background: $background-white !default;
 $left-navbar-drawer-background: darken($sidebars-background, 6%);
 
 $card-shadow: 0 1px 2px 0 rgba(0, 0, 0, .16), 0 2px 10px 0 rgba(0, 0, 0, .12) !default;
diff --git a/app/assets/stylesheets/color_themes/original_white/_style.scss b/app/assets/stylesheets/color_themes/original_white/_style.scss
index 5997151c80..7f702bcafe 100644
--- a/app/assets/stylesheets/color_themes/original_white/_style.scss
+++ b/app/assets/stylesheets/color_themes/original_white/_style.scss
@@ -7,8 +7,8 @@ $main-color-dark: darken($main-color, 15%);
 
 // Variables
 $header-background-color: $main-color-dark;
+$main-background: $background;
 $sidebars-background: $background;
-$sidebars-sub-background: $background;
 $card-shadow: none;
 
 @import 'color_themes/color_theme_override_origwhite';
diff --git a/app/assets/stylesheets/navbar_left.scss b/app/assets/stylesheets/navbar_left.scss
index 6a3b991847..9d91ae065d 100644
--- a/app/assets/stylesheets/navbar_left.scss
+++ b/app/assets/stylesheets/navbar_left.scss
@@ -1,6 +1,5 @@
 /* Fixed backgrounds are a common practice to avoid height issues */
-.left-navbar-fixed-sub-background {
-  background: $sidebars-sub-background;
+.left-navbar-fixed-background {
   position: fixed;
   height: 100%;
 }
diff --git a/app/assets/stylesheets/stream.scss b/app/assets/stylesheets/stream.scss
index 9176d4b262..3af6bf1689 100644
--- a/app/assets/stylesheets/stream.scss
+++ b/app/assets/stylesheets/stream.scss
@@ -2,7 +2,7 @@
 .page-people,
 .page-photos,
 .page-tags {
-  background-color: $sidebars-background;
+  background-color: $main-background;
 }
 
 .stream_container {
diff --git a/app/views/tags/show.haml b/app/views/tags/show.haml
index 4905167687..90026b4951 100644
--- a/app/views/tags/show.haml
+++ b/app/views/tags/show.haml
@@ -32,6 +32,6 @@
         #paginate
           %span.loader.hidden
             .spinner
-            
+
       %a.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
         &#8679;
-- 
GitLab