diff --git a/src/app/theme/components/baPanel/baPanel.directive.js b/src/app/theme/components/baPanel/baPanel.directive.js index 4874e1c..61b2295 100644 --- a/src/app/theme/components/baPanel/baPanel.directive.js +++ b/src/app/theme/components/baPanel/baPanel.directive.js @@ -15,7 +15,7 @@ function baPanel(baPanel) { return angular.extend({}, baPanel, { template: function(el, attrs) { - var res = '
'; + var res = '
'; res += baPanel.template(el, attrs); res += '
'; return res; diff --git a/src/app/theme/theme.constants.js b/src/app/theme/theme.constants.js index 6c11ac6..e1edcc3 100644 --- a/src/app/theme/theme.constants.js +++ b/src/app/theme/theme.constants.js @@ -7,6 +7,8 @@ var IMAGES_ROOT = 'assets/img/'; + var blurTheme = false; + var basic = { default: 'rgba(#000000, 0.2)', defaultText: '#ffffff', @@ -33,6 +35,9 @@ }; angular.module('BlurAdmin.theme') + .constant('layoutTheme', { + blur: blurTheme, + }) .constant('layoutColors', { default: basic.default, defaultText: basic.defaultText, diff --git a/src/app/theme/theme.run.js b/src/app/theme/theme.run.js index 3e12cf7..1d3b8ec 100644 --- a/src/app/theme/theme.run.js +++ b/src/app/theme/theme.run.js @@ -9,9 +9,11 @@ .run(themeRun); /** @ngInject */ - function themeRun($timeout, $rootScope, layoutSizes, layoutPaths, preloader, $q, baSidebarService) { + function themeRun($timeout, $rootScope, layoutTheme, layoutPaths, preloader, $q, baSidebarService) { $rootScope.$isMobile = (/android|webos|iphone|ipad|ipod|blackberry|windows phone/).test(navigator.userAgent.toLowerCase()); + $rootScope.$blurTheme = layoutTheme.blur; + var whatToWait = [ preloader.loadAmCharts(), $timeout(3000) diff --git a/src/index.html b/src/index.html index b61227f..b946a4b 100644 --- a/src/index.html +++ b/src/index.html @@ -24,7 +24,7 @@ - +
diff --git a/src/sass/theme/_layout.scss b/src/sass/theme/_layout.scss index 2f8ce0e..e970da4 100644 --- a/src/sass/theme/_layout.scss +++ b/src/sass/theme/_layout.scss @@ -15,11 +15,13 @@ html, body { body { font: 14px/16px $font-family; color: $default-text; - //background-color: $body-bg; - @include main-background(); + background-color: $body-bg; + &.blur-theme { + @include main-background(); + } } -&.mobile{ +body.mobile{ background: none; .body-bg{ display: block; @@ -29,7 +31,9 @@ body { bottom: 0; right: 0; background-attachment: inherit; - //background-color: $body-bg; + background-color: $body-bg; + } + &.blur-theme { @include main-background(); } } diff --git a/src/sass/theme/bootstrap-overrides/_panel.scss b/src/sass/theme/bootstrap-overrides/_panel.scss index 0ed448f..fc47dd4 100644 --- a/src/sass/theme/bootstrap-overrides/_panel.scss +++ b/src/sass/theme/bootstrap-overrides/_panel.scss @@ -40,11 +40,13 @@ $panel-heading-font-size: 16px; } } -.panel.panel-blur { - $blurredBgUrl: $images-root + 'blur-bg-blurred.jpg'; - background: url($blurredBgUrl); - transition: none; - background-attachment: fixed; +.blur-theme { + .panel.panel-blur { + $blurredBgUrl: $images-root + 'blur-bg-blurred.jpg'; + background: url($blurredBgUrl); + transition: none; + background-attachment: fixed; + } } .panel {