Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-16 23:40:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(dashboard): improve font-weight for dashboard cards

Browse source
This commit is contained in:
KostyaDanovsky 2017-09-01 17:18:02 +03:00
parent f673dca532
commit c00e9b479c
13 changed files with 55 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/app/@theme/styles/theme.cosmic.ts
View file

@ -24,6 +24,8 @@ export const COSMIC_THEME = {
tooltipBorderColor: '#00d977', tooltipBorderColor: '#00d977',
tooltipExtraCss: 'box-shadow: 0px 2px 46px 0 rgba(0, 255, 170, 0.35); border-radius: 10px; padding: 4px 16px;', tooltipExtraCss: 'box-shadow: 0px 2px 46px 0 rgba(0, 255, 170, 0.35); border-radius: 10px; padding: 4px 16px;',
tooltipTextColor: '#ffffff', tooltipTextColor: '#ffffff',
tooltipFontWeight: 'normal',
lineBg: '#d1d1ff', lineBg: '#d1d1ff',
lineShadowBlur: '14', lineShadowBlur: '14',
itemColor: '#BEBBFF', itemColor: '#BEBBFF',
@ -42,6 +44,7 @@ export const COSMIC_THEME = {
tooltipBorderColor: '#00d977', tooltipBorderColor: '#00d977',
tooltipExtraCss: 'box-shadow: 0px 2px 46px 0 rgba(0, 255, 170, 0.35); border-radius: 10px; padding: 8px 24px;', tooltipExtraCss: 'box-shadow: 0px 2px 46px 0 rgba(0, 255, 170, 0.35); border-radius: 10px; padding: 8px 24px;',
tooltipTextColor: '#ffffff', tooltipTextColor: '#ffffff',
tooltipFontWeight: 'normal',
axisLineColor: 'rgba(161, 161 ,229, 0.3)', axisLineColor: 'rgba(161, 161 ,229, 0.3)',
xAxisTextColor: '#a1a1e5', xAxisTextColor: '#a1a1e5',

9
src/app/@theme/styles/theme.default.ts
View file

@ -17,7 +17,9 @@ export const DEFAULT_THEME = {
tooltipBg: '#ffffff', tooltipBg: '#ffffff',
tooltipBorderColor: '#c0c8d1', tooltipBorderColor: '#c0c8d1',
tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;', tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
tooltipTextColor: '#222222', tooltipTextColor: '#2a2a2a',
tooltipFontWeight: 'bolder',
lineBg: '#c0c8d1', lineBg: '#c0c8d1',
lineShadowBlur: '1', lineShadowBlur: '1',
itemColor: '#bcc3cc', itemColor: '#bcc3cc',
@ -35,10 +37,11 @@ export const DEFAULT_THEME = {
tooltipLineWidth: '0', tooltipLineWidth: '0',
tooltipBorderColor: '#ebeef2', tooltipBorderColor: '#ebeef2',
tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;', tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
tooltipTextColor: '#222222', tooltipTextColor: '#2a2a2a',
tooltipFontWeight: 'bolder',
axisLineColor: 'rgba(0, 0, 0, 0)', axisLineColor: 'rgba(0, 0, 0, 0)',
xAxisTextColor: '#222222', xAxisTextColor: '#2a2a2a',
yAxisSplitLine: '#ebeef2', yAxisSplitLine: '#ebeef2',
itemBorderColor: '#42db7d', itemBorderColor: '#42db7d',

9
src/app/pages/dashboard/contacts/contacts.component.scss
View file

@ -43,9 +43,14 @@
} }
.user-name { .user-name {
font-size: 1.25rem; font-damily: nb-theme(font-secondary);
font-weight: nb-theme(font-weight-bolder); font-weight: nb-theme(font-weight-bold);
color: nb-theme(color-fg-heading); color: nb-theme(color-fg-heading);
font-size: 1.25rem;
@include nb-for-theme(cosmic) {
font-weight: nb-theme(font-weight-bolder);
}
} }
.user-title { .user-title {

1
src/app/pages/dashboard/electricity/electricity-chart/electricity-chart.component.ts
View file

@ -63,6 +63,7 @@ export class ElectricityChartComponent implements AfterViewInit {
textStyle: { textStyle: {
color: eTheme.tooltipTextColor, color: eTheme.tooltipTextColor,
fontSize: 20, fontSize: 20,
fontWeight: eTheme.tooltipFontWeight,
}, },
position: 'top', position: 'top',
backgroundColor: eTheme.tooltipBg, backgroundColor: eTheme.tooltipBg,

22
src/app/pages/dashboard/electricity/electricity.component.scss
View file

@ -76,17 +76,6 @@
} }
} }
@include nb-for-theme(cosmic) {
nb-tabset /deep/ ul li.active {
background-color: nb-theme(color-primary);
border-radius: nb-theme(radius);
&::before {
display: none;
}
}
}
.stats-month { .stats-month {
display: flex; display: flex;
align-items: center; align-items: center;
@ -199,4 +188,15 @@
.dropdown { .dropdown {
min-width: 130px; min-width: 130px;
} }
@include nb-for-theme(cosmic) {
nb-tabset /deep/ ul li.active {
background-color: nb-theme(color-primary);
border-radius: nb-theme(radius);
&::before {
display: none;
}
}
}
} }

6
src/app/pages/dashboard/kitten/kitten.component.scss
View file

@ -18,10 +18,14 @@
.title { .title {
font-family: nb-theme(font-secondary); font-family: nb-theme(font-secondary);
font-weight: nb-theme(font-weight-bolder); font-weight: nb-theme(font-weight-bold);
color: nb-theme(color-fg-heading); color: nb-theme(color-fg-heading);
font-size: 1.5rem; font-size: 1.5rem;
margin-bottom: 1rem; margin-bottom: 1rem;
@include nb-for-theme(cosmic) {
font-weight: nb-theme(font-weight-bolder);
}
} }
.description { .description {

12
src/app/pages/dashboard/rooms/room-selector/room-selector.component.scss
View file

@ -1,4 +1,5 @@
@import '../../../../@theme/styles/themes'; @import '../../../../@theme/styles/themes';
@import '~@nebular/theme/components/card/card.component.theme';
@include nb-install-component() { @include nb-install-component() {
:host { :host {
@ -62,21 +63,16 @@
.room-text { .room-text {
fill: nb-theme(color-fg-heading); fill: nb-theme(color-fg-heading);
font-weight: nb-theme(font-weight-bold); font-weight: nb-theme(font-weight-bolder);
} }
.room-border { .room-border {
stroke: nb-theme(color-success); stroke: nb-theme(color-success);
} }
} }
// TODO: Replace with the card header styles mixin
.rooms-card-header { .rooms-card-header {
line-height: 2rem; @include nb-card-header();
font-size: 1.25rem; border-bottom: none;
font-family: nb-theme(font-secondary);
font-weight: nb-theme(font-weight-bolder);
color: nb-theme(color-fg-heading);
padding: 1.25rem;
} }
@include nb-for-theme(cosmic) { @include nb-for-theme(cosmic) {

12
src/app/pages/dashboard/security-cameras/security-cameras.component.scss
View file

@ -81,9 +81,9 @@
width: 100%; width: 100%;
color: white; color: white;
background: rgba(0, 0, 0, 0.4); background: rgba(0, 0, 0, 0.4);
font-family: nb-theme(font-family-secondary); font-family: nb-theme(font-secondary);
font-size: 1rem; font-weight: nb-theme(font-weight-bolder);
font-weight: nb-theme(font-weight-bold); font-size: 1.25rem;
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
} }
@ -110,7 +110,7 @@
} }
span { span {
font-family: nb-theme(font-family-secondary); font-family: nb-theme(font-secondary);
font-weight: nb-theme(font-weight-bold); font-weight: nb-theme(font-weight-bold);
color: nb-theme(color-fg-heading); color: nb-theme(color-fg-heading);
text-transform: uppercase; text-transform: uppercase;
@ -132,5 +132,9 @@
background-color: rgba(0, 0, 0, 0.2); background-color: rgba(0, 0, 0, 0.2);
} }
} }
nb-action span {
font-weight: nb-theme(font-weight-bolder);
}
} }
} }

4
src/app/pages/dashboard/solar/solar.component.scss
View file

@ -27,7 +27,7 @@
.details { .details {
font-size: 1.25rem; font-size: 1.25rem;
font-weight: nb-theme(font-weight-bold); font-weight: nb-theme(font-weight-bolder);
line-height: 1; line-height: 1;
span { span {
font-size: 1rem; font-size: 1rem;
@ -50,7 +50,7 @@
color: nb-theme(color-fg-heading); color: nb-theme(color-fg-heading);
.value { .value {
color: nb-theme(color-success); color: nb-theme(color-fg-highlight);
} }
.details span { .details span {

6
src/app/pages/dashboard/status-card/status-card.component.scss
View file

@ -100,7 +100,7 @@
.title { .title {
font-family: nb-theme(font-secondary); font-family: nb-theme(font-secondary);
font-size: 1.5rem; font-size: 1.5rem;
font-weight: nb-theme(font-weight-bolder); font-weight: nb-theme(font-weight-bold);
color: nb-theme(card-fg-heading); color: nb-theme(card-fg-heading);
} }
@ -126,6 +126,10 @@
border-radius: nb-theme(card-border-radius) 0 0 nb-theme(card-border-radius); border-radius: nb-theme(card-border-radius) 0 0 nb-theme(card-border-radius);
} }
.title {
font-weight: nb-theme(font-weight-bolder);
}
.status { .status {
font-weight: nb-theme(font-weight-light); font-weight: nb-theme(font-weight-light);
} }

1
src/app/pages/dashboard/traffic/traffic-chart.component.ts
View file

@ -64,6 +64,7 @@ export class TrafficChartComponent implements AfterViewInit {
}, },
textStyle: { textStyle: {
color: trafficTheme.tooltipTextColor, color: trafficTheme.tooltipTextColor,
fontWeight: trafficTheme.tooltipFontWeight,
fontSize: 16, fontSize: 16,
}, },
position: 'top', position: 'top',

2
src/app/pages/dashboard/weather/weather.component.scss
View file

@ -16,7 +16,7 @@
font-family: nb-theme(font-secondary); font-family: nb-theme(font-secondary);
font-size: 3rem; font-size: 3rem;
line-height: 3rem; line-height: 3rem;
font-weight: nb-theme(font-weight-light); font-weight: nb-theme(font-weight-normal);
color: nb-theme(color-fg-heading); color: nb-theme(color-fg-heading);
} }

2
src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss
View file

@ -9,7 +9,7 @@
} }
span { span {
font-family: nb-theme(font-family-secondary); font-family: nb-theme(font-secondary);
font-weight: nb-theme(font-weight-bold); font-weight: nb-theme(font-weight-bold);
color: nb-theme(color-fg-heading); color: nb-theme(color-fg-heading);
text-transform: uppercase; text-transform: uppercase;