-
+
{{ selectedCamera.title }}
@@ -40,19 +40,19 @@
-
+
Pause
-
+
Logs
-
+
Search
-
+
Setup
diff --git a/src/app/pages/dashboard/security-cameras/security-cameras.component.scss b/src/app/pages/dashboard/security-cameras/security-cameras.component.scss
index 567b323a..a327a866 100644
--- a/src/app/pages/dashboard/security-cameras/security-cameras.component.scss
+++ b/src/app/pages/dashboard/security-cameras/security-cameras.component.scss
@@ -13,7 +13,7 @@
.single-view-button {
.nb-square {
- font-size: 1.25rem;
+ font-size: 1rem;
}
@include nb-ltr {
@@ -72,6 +72,10 @@
background-size: cover;
position: relative;
+ &:not(.single) {
+ cursor: pointer;
+ }
+
&::before {
background-color: rgba(255, 255, 255, 0.1);
content: '';
@@ -96,6 +100,9 @@
}
nb-action {
+ cursor: pointer;
+ border-radius: 2px;
+
nb-icon {
@include nb-ltr(margin-right, 0.5rem);
@include nb-rtl(margin-left, 0.5rem);
diff --git a/src/app/pages/dashboard/status-card/status-card.component.scss b/src/app/pages/dashboard/status-card/status-card.component.scss
index 03be02f5..158df84b 100644
--- a/src/app/pages/dashboard/status-card/status-card.component.scss
+++ b/src/app/pages/dashboard/status-card/status-card.component.scss
@@ -5,7 +5,7 @@
flex-direction: row;
align-items: center;
height: 6rem;
- overflow: visible;
+ cursor: pointer;
.icon-container {
height: 100%;
diff --git a/src/app/pages/dashboard/status-card/status-card.component.ts b/src/app/pages/dashboard/status-card/status-card.component.ts
index 16276408..3ffd6ad2 100644
--- a/src/app/pages/dashboard/status-card/status-card.component.ts
+++ b/src/app/pages/dashboard/status-card/status-card.component.ts
@@ -4,7 +4,7 @@ import { Component, Input } from '@angular/core';
selector: 'ngx-status-card',
styleUrls: ['./status-card.component.scss'],
template: `
-
+
diff --git a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html
index 7f46e332..826b87b9 100644
--- a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html
+++ b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html
@@ -42,6 +42,6 @@
-
-
+
-
+
-
+
-
+
@@ -51,16 +51,16 @@
diff --git a/src/app/pages/dashboard/traffic/traffic.component.ts b/src/app/pages/dashboard/traffic/traffic.component.ts
index 3ddd6e2c..a0396689 100644
--- a/src/app/pages/dashboard/traffic/traffic.component.ts
+++ b/src/app/pages/dashboard/traffic/traffic.component.ts
@@ -12,8 +12,8 @@ import { TrafficChartData } from '../../../@core/data/traffic-chart';
Traffic Consumption
-
- {{ t }}
+
+ {{ t }}
diff --git a/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.html b/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.html
index 30bf039a..f2ba91aa 100644
--- a/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.html
+++ b/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.html
@@ -1,7 +1,7 @@
-
-
+
+
{{ period }}
diff --git a/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.scss b/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.scss
index 52cb2cab..51b123bb 100644
--- a/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.scss
+++ b/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.scss
@@ -11,9 +11,9 @@
ngx-legend-chart,
.period-select {
- padding-top: 1rem;
- @include nb-ltr(padding-left, 0.5rem);
- @include nb-rtl(padding-right, 0.5rem);
+ margin-top: 1rem;
+ @include nb-ltr(margin-left, 0.5rem);
+ @include nb-rtl(margin-right, 0.5rem);
}
@include media-breakpoint-up(md) {
diff --git a/src/app/pages/e-commerce/charts-panel/charts-panel.component.scss b/src/app/pages/e-commerce/charts-panel/charts-panel.component.scss
index acf1a902..4d601af1 100644
--- a/src/app/pages/e-commerce/charts-panel/charts-panel.component.scss
+++ b/src/app/pages/e-commerce/charts-panel/charts-panel.component.scss
@@ -6,6 +6,10 @@ $legend-canceled-color: #3f4fda;
@include nb-install-component() {
+ nb-card {
+ overflow: hidden;
+ }
+
nb-tabset {
display: flex;
flex-direction: column;
diff --git a/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.html b/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.html
index 0f932318..abaa6784 100644
--- a/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.html
+++ b/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.html
@@ -1,6 +1,6 @@
-
- {{ currency }}
+
+ {{ currency }}
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-back-card.component.html b/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-back-card.component.html
index 8c483a7e..42e18aa3 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-back-card.component.html
+++ b/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-back-card.component.html
@@ -1,6 +1,5 @@
-
-
-
-
+
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-back-card.component.scss b/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-back-card.component.scss
index 00e2406e..0663243a 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-back-card.component.scss
+++ b/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-back-card.component.scss
@@ -1,19 +1,7 @@
@import '../../../../@theme/styles/themes';
@include nb-install-component() {
- display: flex;
- flex-direction: column;
- flex: 1;
-
- nb-card-body {
- overflow: hidden;
- position: relative;
- display: flex;
- flex-direction: column;
- }
-
ngx-traffic-bar-chart {
- flex: 1;
position: relative;
::ng-deep {
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-front-card.component.scss b/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-front-card.component.scss
index 835388ad..128c6745 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-front-card.component.scss
+++ b/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-front-card.component.scss
@@ -3,7 +3,11 @@
@import '../../../../@theme/styles/themes';
@include nb-install-component() {
- overflow: auto;
+ overflow: hidden;
+
+ nb-list {
+ height: 100%;
+ }
.item {
display: flex;
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.html b/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.html
index 4e225305..630e0564 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.html
+++ b/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.html
@@ -1,6 +1,4 @@
-
- Traffic
-
- {{ period }}
-
-
+Traffic
+
+ {{ period }}
+
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.scss b/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.scss
index b92c1db3..958c42bc 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.scss
+++ b/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.scss
@@ -1,14 +1,5 @@
-@import '../../../../@theme/styles/themes';
-
-@include nb-install-component() {
- nb-card-header {
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding-top: nb-theme(card-header-with-select-padding-top);
- padding-bottom: nb-theme(card-header-with-select-padding-bottom);
-
- @include nb-ltr(padding-right, 4rem);
- @include nb-rtl(padding-left, 4rem);
- }
+:host {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
}
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.html b/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.html
index 1b11ab71..1a8faa00 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.html
+++ b/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.html
@@ -1,15 +1,23 @@
-
+
+
+
+
-
-
+
+
+
+
+
+
+
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.scss b/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.scss
index 42f55746..ccf47060 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.scss
+++ b/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.scss
@@ -9,4 +9,11 @@
@include nb-rtl(left, 1.25rem);
cursor: pointer;
}
+
+ nb-card-header {
+ padding-top: nb-theme(card-header-with-select-padding-top);
+ padding-bottom: nb-theme(card-header-with-select-padding-bottom);
+ @include nb-ltr(padding-right, 4rem);
+ @include nb-rtl(padding-left, 4rem);
+ }
}
diff --git a/src/app/pages/e-commerce/user-activity/user-activity.component.html b/src/app/pages/e-commerce/user-activity/user-activity.component.html
index 445f18f9..46ba0524 100644
--- a/src/app/pages/e-commerce/user-activity/user-activity.component.html
+++ b/src/app/pages/e-commerce/user-activity/user-activity.component.html
@@ -2,8 +2,8 @@
User Activity
-
- {{ t }}
+
+ {{ t }}
diff --git a/src/app/pages/e-commerce/visitors-analytics/visitors-analytics.component.scss b/src/app/pages/e-commerce/visitors-analytics/visitors-analytics.component.scss
index b8af1e7b..dadf5a21 100644
--- a/src/app/pages/e-commerce/visitors-analytics/visitors-analytics.component.scss
+++ b/src/app/pages/e-commerce/visitors-analytics/visitors-analytics.component.scss
@@ -5,10 +5,10 @@
@include nb-install-component() {
position: relative;
display: block;
- overflow: hidden;
nb-card {
position: relative;
+ overflow: hidden;
}
nb-card-header {
diff --git a/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.html b/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.html
index bc2ff55c..e547a3ea 100644
--- a/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.html
+++ b/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.html
@@ -3,33 +3,33 @@
-
-
-
-
-
-
diff --git a/src/app/pages/forms/buttons/buttons.component.html b/src/app/pages/forms/buttons/buttons.component.html
index b9bbeb50..a4673f5d 100644
--- a/src/app/pages/forms/buttons/buttons.component.html
+++ b/src/app/pages/forms/buttons/buttons.component.html
@@ -4,10 +4,10 @@
Hero Buttons
-
@@ -18,10 +18,10 @@
Default Buttons
-
@@ -32,10 +32,10 @@
Outline Buttons
-
@@ -46,10 +46,10 @@
Ghost Buttons
-
@@ -62,7 +62,7 @@
Button shapes
-
@@ -73,7 +73,7 @@
Button sizes
-
@@ -86,13 +86,13 @@
Action Groups
-
-
-
+
+
+
-
+
-
+
@@ -100,24 +100,30 @@
-
+
Pause
-
+
Logs
-
+
Search
-
+
Setup
+
+
+
+
+
+
diff --git a/src/app/pages/forms/buttons/buttons.component.scss b/src/app/pages/forms/buttons/buttons.component.scss
index 71df8954..19176e49 100644
--- a/src/app/pages/forms/buttons/buttons.component.scss
+++ b/src/app/pages/forms/buttons/buttons.component.scss
@@ -17,4 +17,9 @@
.actions-card {
height: 8rem;
}
+
+ nb-action {
+ border-radius: 2px;
+ cursor: pointer;
+ }
}
diff --git a/src/app/pages/forms/buttons/buttons.component.ts b/src/app/pages/forms/buttons/buttons.component.ts
index f839321e..52e8506b 100644
--- a/src/app/pages/forms/buttons/buttons.component.ts
+++ b/src/app/pages/forms/buttons/buttons.component.ts
@@ -1,5 +1,7 @@
import { Component } from '@angular/core';
-import { NbComponentShape, NbComponentSize, NbComponentStatus } from '@nebular/theme';
+import { NbComponentShape, NbComponentSize, NbComponentStatus, NbThemeService } from '@nebular/theme';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
@Component({
selector: 'ngx-buttons',
@@ -7,7 +9,18 @@ import { NbComponentShape, NbComponentSize, NbComponentStatus } from '@nebular/t
templateUrl: './buttons.component.html',
})
export class ButtonsComponent {
- statuses: NbComponentStatus[] = [ 'primary', 'success', 'info', 'warning', 'danger' ];
- shapes: NbComponentShape[] = [ 'rectangle', 'semi-round', 'round' ];
- sizes: NbComponentSize[] = [ 'tiny', 'small', 'medium', 'large', 'giant' ];
+ public constructor(private readonly themeService: NbThemeService) {
+ this.materialTheme$ = this.themeService.onThemeChange()
+ .pipe(map(theme => {
+ const themeName: string = theme?.name || '';
+ return themeName.startsWith('material');
+ }));
+ }
+
+ public readonly materialTheme$: Observable;
+
+ public readonly statuses: NbComponentStatus[] = [ 'primary', 'success', 'info', 'warning', 'danger' ];
+ public readonly shapes: NbComponentShape[] = [ 'rectangle', 'semi-round', 'round' ];
+ public readonly sizes: NbComponentSize[] = [ 'tiny', 'small', 'medium', 'large', 'giant' ];
+
}
diff --git a/src/app/pages/forms/buttons/material-buttons/material-buttons.component.html b/src/app/pages/forms/buttons/material-buttons/material-buttons.component.html
new file mode 100644
index 00000000..d9c0e982
--- /dev/null
+++ b/src/app/pages/forms/buttons/material-buttons/material-buttons.component.html
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+ Toggle left
+ Toggle right
+
\ No newline at end of file
diff --git a/src/app/pages/forms/buttons/material-buttons/material-buttons.component.scss b/src/app/pages/forms/buttons/material-buttons/material-buttons.component.scss
new file mode 100644
index 00000000..89571005
--- /dev/null
+++ b/src/app/pages/forms/buttons/material-buttons/material-buttons.component.scss
@@ -0,0 +1,3 @@
+button, mat-button-toggle-group {
+ margin: 0.5rem;
+}
diff --git a/src/app/pages/forms/buttons/material-buttons/material-buttons.component.ts b/src/app/pages/forms/buttons/material-buttons/material-buttons.component.ts
new file mode 100644
index 00000000..55cf55ff
--- /dev/null
+++ b/src/app/pages/forms/buttons/material-buttons/material-buttons.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'ngx-material-buttons',
+ templateUrl: './material-buttons.component.html',
+ styleUrls: ['./material-buttons.component.scss'],
+})
+export class MaterialButtonsComponent {}
diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.html b/src/app/pages/forms/form-inputs/form-inputs.component.html
index 962904ab..5e40366a 100644
--- a/src/app/pages/forms/form-inputs/form-inputs.component.html
+++ b/src/app/pages/forms/form-inputs/form-inputs.component.html
@@ -10,8 +10,10 @@