diff --git a/package.json b/package.json index 608d6bdd..7e4d566a 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "google-maps": "^3.2.1", "jquery": "^2.2.3", "leaflet-map": "^0.2.1", + "lodash": "^4.12.0", "ng2-bootstrap": "^1.0.16", "ng2-charts": "^1.0.3", "normalize.css": "^4.1.1", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index b918a561..2e1ee672 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -3,7 +3,7 @@ import {RouteConfig} from '@angular/router-deprecated'; import {Pages} from './pages'; import {AppState} from './app.state'; -import {BaThemeConfigProvider} from './theme'; +import {BaThemeConfigProvider, BaThemeConfig} from './theme'; import './app.loader.ts'; /* @@ -13,7 +13,7 @@ import './app.loader.ts'; @Component({ selector: 'app', pipes: [], - providers: [BaThemeConfigProvider], + providers: [BaThemeConfigProvider, BaThemeConfig], encapsulation: ViewEncapsulation.None, styles: [require('normalize.css'), require('./app.scss')], template: ` @@ -34,7 +34,7 @@ export class App { isMenuCollapsed:boolean = false; - constructor(private _state:AppState) { + constructor(private _state:AppState, private _baThemeConfig:BaThemeConfig) { this._state.subscribe('menu.isCollapsed', (isCollapsed) => { this.isMenuCollapsed = isCollapsed; diff --git a/src/app/pages/charts/components/chartistJs/chartistJs.service.ts b/src/app/pages/charts/components/chartistJs/chartistJs.service.ts index 2d01b7b1..1a3f661d 100644 --- a/src/app/pages/charts/components/chartistJs/chartistJs.service.ts +++ b/src/app/pages/charts/components/chartistJs/chartistJs.service.ts @@ -174,7 +174,6 @@ export class ChartistJsService { } public getAll() { - console.log(this._data); return this._data; } diff --git a/src/app/theme/components/baCard/baCardBlurHelper.service.ts b/src/app/theme/components/baCard/baCardBlurHelper.service.ts index 035a9c59..426fc861 100644 --- a/src/app/theme/components/baCard/baCardBlurHelper.service.ts +++ b/src/app/theme/components/baCard/baCardBlurHelper.service.ts @@ -43,8 +43,7 @@ export class BaCardBlurHelper { private _genImageLoadSubject():void { this.imageLoadSubject = new Subject(); - this.image.onerror = () => { - this.imageLoadSubject.error(); + this.image.onerror = (err) => { this.imageLoadSubject.complete(); }; this.image.onload = () => { diff --git a/src/app/theme/index.ts b/src/app/theme/index.ts index 7b7530bb..df82c5e2 100644 --- a/src/app/theme/index.ts +++ b/src/app/theme/index.ts @@ -1,2 +1,3 @@ export * from './theme.constants' export * from './theme.configProvider' +export * from './theme.config' diff --git a/src/app/theme/sass/bootstrap-overrides/_card.scss b/src/app/theme/sass/bootstrap-overrides/_card.scss index 9cacfb55..a24f38d4 100644 --- a/src/app/theme/sass/bootstrap-overrides/_card.scss +++ b/src/app/theme/sass/bootstrap-overrides/_card.scss @@ -45,6 +45,10 @@ $card-header-font-size: 16px; background: url($blurredBgUrl); transition: none; background-attachment: fixed; + + .card-header, .card-footer { + background: transparent; + } } .card { diff --git a/src/app/theme/sass/conf/conf.scss b/src/app/theme/sass/conf/conf.scss index d418df74..4bfc057d 100644 --- a/src/app/theme/sass/conf/conf.scss +++ b/src/app/theme/sass/conf/conf.scss @@ -1,3 +1,3 @@ @import 'mixins'; -@import 'colorSchemes/mint'; +@import 'colorSchemes/blur'; @import 'variables'; diff --git a/src/app/theme/theme.config.ts b/src/app/theme/theme.config.ts new file mode 100644 index 00000000..11eb5227 --- /dev/null +++ b/src/app/theme/theme.config.ts @@ -0,0 +1,22 @@ +import {Injectable} from '@angular/core'; +import {BaThemeConfigProvider} from './theme.configProvider'; + +@Injectable() +export class BaThemeConfig { + + constructor(private _baConfig:BaThemeConfigProvider) { + this._config(); + } + + private _config() { + this._baConfig.changeTheme({blur: true}); + + this._baConfig.changeColors({ + default: 'rgba(#000000, 0.2)', + defaultText: '#ffffff', + dashboard: { + white: '#ffffff', + }, + }); + } +} diff --git a/src/app/theme/theme.configProvider.ts b/src/app/theme/theme.configProvider.ts index fb1d6c51..f5cd7936 100644 --- a/src/app/theme/theme.configProvider.ts +++ b/src/app/theme/theme.configProvider.ts @@ -70,4 +70,12 @@ export class BaThemeConfigProvider { get() { return this.conf; } + + changeTheme (theme) { + _.merge(this.get().theme, theme); + } + + changeColors (colors) { + _.merge(this.get().colors, colors); + } } diff --git a/src/index.html b/src/index.html index 8caaf102..c297c1b0 100644 --- a/src/index.html +++ b/src/index.html @@ -19,7 +19,7 @@ - +
diff --git a/src/vendor.ts b/src/vendor.ts index 0243d3b5..a5c5b6cd 100644 --- a/src/vendor.ts +++ b/src/vendor.ts @@ -19,7 +19,7 @@ import 'rxjs/add/operator/mergeMap'; import 'jquery'; import 'bootstrap-loader'; import 'font-awesome-sass-loader'; - +import 'lodash'; if ('production' === ENV) { // Production diff --git a/typings.json b/typings.json index eed92ef9..005a79b0 100644 --- a/typings.json +++ b/typings.json @@ -6,6 +6,7 @@ "ambientDependencies": { "core-js": "registry:dt/core-js#0.0.0+20160317120654", "hammerjs": "github:DefinitelyTyped/DefinitelyTyped/hammerjs/hammerjs.d.ts#74a4dfc1bc2dfadec47b8aae953b28546cb9c6b7", + "lodash": "registry:dt/lodash#3.10.0+20160330154726", "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#8cf8164641be73e8f1e652c2a5b967c7210b6729", "webpack": "github:DefinitelyTyped/DefinitelyTyped/webpack/webpack.d.ts#95c02169ba8fa58ac1092422efbd2e3174a206f4" }