diff --git a/src/app/pages/charts/chart.js/chart-js.component.html b/src/app/pages/charts/chart.js/chart-js.component.html index f6740aaa..c7ca7c06 100644 --- a/src/app/pages/charts/chart.js/chart-js.component.html +++ b/src/app/pages/charts/chart.js/chart-js.component.html @@ -1,6 +1,6 @@
- + Pie @@ -8,7 +8,7 @@
- + Bar @@ -16,7 +16,7 @@
- + Line diff --git a/src/app/pages/charts/d3/d3.component.html b/src/app/pages/charts/d3/d3.component.html index 2f8f654e..c885d75a 100644 --- a/src/app/pages/charts/d3/d3.component.html +++ b/src/app/pages/charts/d3/d3.component.html @@ -1,6 +1,6 @@
- + Pie @@ -8,7 +8,7 @@
- + Bar @@ -18,7 +18,7 @@
- + Line diff --git a/src/app/pages/charts/echarts/echarts.component.html b/src/app/pages/charts/echarts/echarts.component.html index 1cb2237a..7ef6451e 100644 --- a/src/app/pages/charts/echarts/echarts.component.html +++ b/src/app/pages/charts/echarts/echarts.component.html @@ -1,6 +1,6 @@
- + Pie @@ -8,7 +8,7 @@
- + Bar @@ -18,7 +18,7 @@
- + Line diff --git a/src/app/pages/dashboard/contacts/contacts.component.html b/src/app/pages/dashboard/contacts/contacts.component.html index 0d7aa601..9233ddf9 100644 --- a/src/app/pages/dashboard/contacts/contacts.component.html +++ b/src/app/pages/dashboard/contacts/contacts.component.html @@ -1,14 +1,14 @@ - +
- +
- + {{ c.time }}
diff --git a/src/app/pages/dashboard/dashboard.component.html b/src/app/pages/dashboard/dashboard.component.html index 84d9d295..7e76ca36 100644 --- a/src/app/pages/dashboard/dashboard.component.html +++ b/src/app/pages/dashboard/dashboard.component.html @@ -7,7 +7,7 @@
- + Electricity @@ -26,33 +26,29 @@
-
-
-
- - Solar Energy Consumption - - -
-
- - Traffic Consumption - - -
-
- -
-
- - Calendar - - -
-
+
+ + Solar Energy Consumption + + + +
+ +
+ + Traffic Consumption + + + + + Calendar + + +
+
- + Security Cameras diff --git a/src/app/pages/dashboard/rooms/rooms.component.ts b/src/app/pages/dashboard/rooms/rooms.component.ts index 9e28351d..ec00732a 100644 --- a/src/app/pages/dashboard/rooms/rooms.component.ts +++ b/src/app/pages/dashboard/rooms/rooms.component.ts @@ -4,7 +4,7 @@ import { Component } from '@angular/core'; selector: 'ngx-rooms', styleUrls: ['./rooms.component.scss'], template: ` - + Room Management diff --git a/src/app/pages/dashboard/status-cards/status-cards.component.scss b/src/app/pages/dashboard/status-cards/status-cards.component.scss index 10e96acf..88851ebb 100644 --- a/src/app/pages/dashboard/status-cards/status-cards.component.scss +++ b/src/app/pages/dashboard/status-cards/status-cards.component.scss @@ -17,8 +17,12 @@ $border-radius: nga-theme(card-border-radius); .icon-container { + display: flex; + align-items: center; + justify-content: center; + height: 100%; + width: 7rem; font-size: 4em; - padding: 0.5rem 1.75rem; border-radius: $border-radius 0 0 $border-radius; transition: all 0.1s ease-out, color 0s; @@ -109,7 +113,9 @@ border-left: 1px solid transparent; } .title { + font-family: nga-theme(font-secondary); font-size: 1.5rem; + font-weight: nga-theme(font-weight-bolder); } .status { font-size: 1.125rem; diff --git a/src/app/pages/dashboard/status-cards/status-cards.component.ts b/src/app/pages/dashboard/status-cards/status-cards.component.ts index b49805fd..04acda51 100644 --- a/src/app/pages/dashboard/status-cards/status-cards.component.ts +++ b/src/app/pages/dashboard/status-cards/status-cards.component.ts @@ -5,7 +5,7 @@ import { Component } from '@angular/core'; styleUrls: ['./status-cards.component.scss'], template: `
-
+
@@ -22,8 +22,8 @@ import { Component } from '@angular/core'; }) export class StatusCardsComponent { statusCards = [ - { title: 'Light', on: true, type: 'primary', icon: 'ion-ios-game-controller-b-outline' }, - { title: 'RollerShades', on: true, type: 'success', icon: 'ion-ios-game-controller-b-outline' }, + { title: 'Light', on: true, type: 'primary', icon: 'ion-ios-lightbulb-outline' }, + { title: 'Roller Shades', on: true, type: 'success', icon: 'ion-ios-photos-outline' }, { title: 'Wireless Audio', on: true, type: 'info', icon: 'ion-ios-game-controller-b-outline' }, { title: 'Coffee Maker', on: true, type: 'warning', icon: 'ion-ios-game-controller-b-outline' }, ]; diff --git a/src/app/pages/dashboard/team/team.component.html b/src/app/pages/dashboard/team/team.component.html index 60f7b253..5cd85c3f 100644 --- a/src/app/pages/dashboard/team/team.component.html +++ b/src/app/pages/dashboard/team/team.component.html @@ -1,4 +1,4 @@ - +