Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2026-01-25 02:36:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

calendar component fix per new styles

Browse source
This commit is contained in:
nixa 2016-05-16 17:42:01 +03:00
parent a8363d02b8
commit 5fa1b335c6
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/app/pages/dashboard/calendar/calendar.component.ts
View file

@ -1,7 +1,7 @@
import {Component, ViewEncapsulation} from '@angular/core';
import './calendar.loader.ts';
import {layoutColors} from "../../../theme/theme.constants";
import {BaThemeConfigProvider} from '../../../theme';
@Component({
selector: 'calendar',
@ -11,13 +11,15 @@ import {layoutColors} from "../../../theme/theme.constants";
})
export class Calendar {
constructor(private _baConfig:BaThemeConfigProvider) {
}
ngAfterViewInit() {
this._initCalendar();
}
_initCalendar() {
let palette = layoutColors.bgColorPalette;
let dashboardColors = this._baConfig.get().colors.dashboard;
let $element = $('#calendar').fullCalendar({
header: {
@ -47,23 +49,23 @@ export class Calendar {
{
title: 'All Day Event',
start: '2016-03-01',
color: palette.silverTree
color: dashboardColors.silverTree
},
{
title: 'Long Event',
start: '2016-03-07',
end: '2016-03-10',
color: palette.blueStone
color: dashboardColors.blueStone
},
{
title: 'Dinner',
start: '2016-03-14T20:00:00',
color: palette.surfieGreen
color: dashboardColors.surfieGreen
},
{
title: 'Birthday Party',
start: '2016-04-01T07:00:00',
color: palette.gossipDark
color: dashboardColors.gossip
}
]
});

2
src/app/pages/dashboard/calendar/calendar.scss
View file

@ -723,7 +723,7 @@ a.fc-more {
height: auto!important;
}
.calendar-panel.panel .panel-body{
.calendar-panel.card .card-body{
padding: 0;
}

4
src/app/theme/components/baCard/baCardBlur.directive.ts
View file

@ -14,7 +14,7 @@ export class BaCardBlur {
private _bodyBgSize:BgMetrics;
constructor(private _baThemeConfigProvider:BaThemeConfigProvider, private _baCardBlurHelper:BaCardBlurHelper, private _el:ElementRef) {
constructor(private _baConfig:BaThemeConfigProvider, private _baCardBlurHelper:BaCardBlurHelper, private _el:ElementRef) {
if (this._isEnabled()) {
this._getBodyImageSizesOnBgLoad();
this._recalculateCardStylesOnBgLoad();
@ -52,6 +52,6 @@ export class BaCardBlur {
}
private _isEnabled() {
return this._baThemeConfigProvider.get().theme.blur;
return this._baConfig.get().theme.blur;
}
}