diff --git a/app/assets/stylesheets/color-variables.scss b/app/assets/stylesheets/color-variables.scss index a4c9f7e41e663c78d6e9b56a1cd854a36b6570f3..d3862a09d7c0bfa11f7ab45b5231d8360db322a1 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 5997151c80acfbdb47456f75da9b33b986b1f025..7f702bcafe32942c1a4a688926dd87310aa3b0fd 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 6a3b991847423348bf887ff854a9567bd1bca491..9d91ae065d83e015f483efcd92415284cd47fb89 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 9176d4b262849f235b7f414cd0cc1803fc88a4ad..3af6bf16899f2ea10aef2331f65ab1f999cd575a 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 4905167687925b660155c403e189d73f6c1855a7..90026b4951201cc1ffaa2dc2250db70cf3845435 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: "#"} ⇧