From 0b44fd6293236c7bb07d51fbc5f276f5bbfb6421 Mon Sep 17 00:00:00 2001 From: nixa <4dmitr@gmail.com> Date: Tue, 24 May 2016 11:24:49 +0300 Subject: [PATCH] fix(styles): move blur bg to blur theme configuration --- src/app/theme/sass/_layout.scss | 6 +----- src/app/theme/sass/conf/_mixins.scss | 17 ----------------- src/app/theme/sass/conf/colorSchemes/_blur.scss | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/app/theme/sass/_layout.scss b/src/app/theme/sass/_layout.scss index 18c7c8e9..3f4d82d4 100644 --- a/src/app/theme/sass/_layout.scss +++ b/src/app/theme/sass/_layout.scss @@ -18,11 +18,8 @@ main { position: relative; font: 14px/16px $font-family; color: $default-text; - @include body-bg(); - &.blur { - @include main-background(); - } + @include body-bg(); .additional-bg { position: fixed; @@ -30,7 +27,6 @@ main { left: 0; bottom: 0; right: 0; - //background-attachment: inherit; @include additional-bg(); } } diff --git a/src/app/theme/sass/conf/_mixins.scss b/src/app/theme/sass/conf/_mixins.scss index b7eae69e..37be10e8 100644 --- a/src/app/theme/sass/conf/_mixins.scss +++ b/src/app/theme/sass/conf/_mixins.scss @@ -49,23 +49,6 @@ background-image: url($images-root + $relativeUrl); } -@mixin main-background() { - $mainBgUrl: $images-root + 'blur-bg.jpg'; - - &::before { - content: ''; - position: fixed; - width: 100%; - height: 100%; - top: 0; - left: 0; - background: url($mainBgUrl) no-repeat center center; - background-size: cover; - will-change: transform; - z-index: 0; - } -} - @mixin bg-translucent-dark($opacity) { background: rgba(0, 0, 0, $opacity); } diff --git a/src/app/theme/sass/conf/colorSchemes/_blur.scss b/src/app/theme/sass/conf/colorSchemes/_blur.scss index 8339aea9..31f44293 100644 --- a/src/app/theme/sass/conf/colorSchemes/_blur.scss +++ b/src/app/theme/sass/conf/colorSchemes/_blur.scss @@ -57,6 +57,21 @@ $hoverlink: $primary-dark; @mixin body-bg() { background-color: $body-bg; + + $mainBgUrl: $images-root + 'blur-bg.jpg'; + + &::before { + content: ''; + position: fixed; + width: 100%; + height: 100%; + top: 0; + left: 0; + background: url($mainBgUrl) no-repeat center center; + background-size: cover; + will-change: transform; + z-index: 0; + } } @mixin additional-bg() { display: none;