From ba3838775482ea48a0438af8867cce3ef0f11bb0 Mon Sep 17 00:00:00 2001 From: KostyaDanovsky Date: Mon, 16 May 2016 12:21:59 +0300 Subject: [PATCH] fix(colorScheme): make mint theme default --- src/app/theme/theme.config.js | 14 ++++++++------ src/app/theme/theme.configProvider.js | 8 ++++---- src/sass/common.scss | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/app/theme/theme.config.js b/src/app/theme/theme.config.js index 0e6d036..1a9303b 100644 --- a/src/app/theme/theme.config.js +++ b/src/app/theme/theme.config.js @@ -10,12 +10,14 @@ /** @ngInject */ function config(baConfigProvider, colorHelper) { - //baConfigProvider.theme.blur = false; + //baConfigProvider.changeTheme({blur: true}); // - //var colors = baConfigProvider.colors; - //colors.default = '#ffffff'; - //colors.defaultText = '#666666'; - //colors.dashboard.white = '#10c4b5'; - //colors.dashboard.whiteDark = colorHelper.shade(colors.dashboard.white, 5); + //baConfigProvider.changeColors({ + // default: 'rgba(#000000, 0.2)', + // defaultText: '#ffffff', + // dashboard: { + // white: '#ffffff', + // }, + //}); } })(); diff --git a/src/app/theme/theme.configProvider.js b/src/app/theme/theme.configProvider.js index 686e074..365f1c9 100644 --- a/src/app/theme/theme.configProvider.js +++ b/src/app/theme/theme.configProvider.js @@ -6,8 +6,8 @@ 'use strict'; var basic = { - default: 'rgba(#000000, 0.2)', - defaultText: '#ffffff', + default: '#ffffff', + defaultText: '#666666', border: '#dddddd', borderDark: '#aaaaaa', }; @@ -27,7 +27,7 @@ surfieGreen: '#0e8174', silverTree: '#6eba8c', gossip: '#b9f2a1', - white: '#ffffff', + white: '#10c4b5', }; angular.module('BlurAdmin.theme') @@ -37,7 +37,7 @@ function configProvider(colorHelper) { var conf = { theme: { - blur: true, + blur: false, }, colors: { default: basic.default, diff --git a/src/sass/common.scss b/src/sass/common.scss index b1468aa..df04ce9 100644 --- a/src/sass/common.scss +++ b/src/sass/common.scss @@ -1,3 +1,3 @@ @import 'theme/conf/mixins'; -@import 'theme/conf/colorScheme/blur'; +@import 'theme/conf/colorScheme/mint'; @import 'theme/conf/variables';