diff --git a/src/app/@theme/styles/themes.scss b/src/app/@theme/styles/themes.scss
index 1f3207b3..9dc76c3a 100644
--- a/src/app/@theme/styles/themes.scss
+++ b/src/app/@theme/styles/themes.scss
@@ -47,6 +47,9 @@ $nb-themes: nb-register-theme((
), default, default);
$nb-themes: nb-register-theme((
+
+ card-height-tiny: 13.5rem,
+ select-min-width: 6rem,
// app wise variables for each theme
//sidebar-header-gap: 2rem,
//sidebar-header-height: initial,
@@ -83,6 +86,9 @@ $nb-themes: nb-register-theme((
), cosmic, cosmic);
$nb-themes: nb-register-theme((
+
+ card-height-tiny: 13.5rem,
+ select-min-width: 6rem,
// app wise variables for each theme
//sidebar-header-gap: 2rem,
//sidebar-header-height: initial,
@@ -117,3 +123,8 @@ $nb-themes: nb-register-theme((
//
//progress-bar-background: linear-gradient(90deg, #ff9f6f 0%, #ff8b97 100%),
), corporate, corporate);
+
+$nb-themes: nb-register-theme((
+ card-height-tiny: 13.5rem,
+ select-min-width: 6rem,
+), dark, dark);
diff --git a/src/app/pages/e-commerce/e-commerce.module.ts b/src/app/pages/e-commerce/e-commerce.module.ts
index dd832bf9..c3f8ef2a 100644
--- a/src/app/pages/e-commerce/e-commerce.module.ts
+++ b/src/app/pages/e-commerce/e-commerce.module.ts
@@ -7,6 +7,7 @@ import {
NbUserModule,
NbIconModule,
NbSelectModule,
+ NbListModule,
} from '@nebular/theme';
import { NgxEchartsModule } from 'ngx-echarts';
import { NgxChartsModule } from '@swimlane/ngx-charts';
@@ -64,6 +65,7 @@ import { EarningLiveUpdateChartComponent } from './earning-card/front-side/earni
NbIconModule,
NbTabsetModule,
NbSelectModule,
+ NbListModule,
ChartModule,
NbProgressBarModule,
NgxEchartsModule,
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 e9b1e201..00e2406e 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
@@ -15,15 +15,17 @@
ngx-traffic-bar-chart {
flex: 1;
position: relative;
- }
- ::ng-deep canvas {
- border-bottom-left-radius: nb-theme(card-border-radius);
- border-bottom-right-radius: nb-theme(card-border-radius);
- }
+ ::ng-deep {
+ canvas {
+ border-bottom-left-radius: nb-theme(card-border-radius);
+ border-bottom-right-radius: nb-theme(card-border-radius);
+ }
- .echart {
- height: 100%;
- width: 100%;
+ .echart {
+ height: 100%;
+ width: 100%;
+ }
+ }
}
}
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-bar-chart.component.ts b/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-bar-chart.component.ts
index 343055d5..8d01626a 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-bar-chart.component.ts
+++ b/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-bar-chart.component.ts
@@ -7,7 +7,6 @@ declare const echarts: any;
@Component({
selector: 'ngx-traffic-bar-chart',
- styleUrls: ['traffic-back-card.component.scss'],
template: `
-
-
+
+
+ {{ item.date }}
+ {{ item.value }}
+
+ {{ item.delta.value }}%
+
+
+
+
+
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 1bf70c35..4c100b81 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
@@ -1,53 +1,21 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/theme/components/card/card.component.theme';
-@import '~@nebular/theme/styles/global/typography/typography';
@import '~bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints';
+@import '../../../../@theme/styles/themes';
@include nb-install-component() {
overflow: auto;
nb-card-body {
padding: 0;
- position: relative;
display: flex;
flex-direction: column;
}
- .traffic-list {
- padding: 0;
- margin: 0;
- }
-
- li {
- list-style: none;
+ .item {
display: flex;
justify-content: space-between;
align-items: center;
height: 4.5rem;
- font-size: 1.25rem;
- position: relative;
- color: nb-theme(color-fg);
- padding: 1rem nb-theme(card-padding);
- border-bottom:
- nb-theme(list-item-border-width)
- nb-theme(card-header-border-type)
- nb-theme(separator);
-
- &:hover {
- background-color: nb-theme(layout-bg);
-
- &::before {
- position: absolute;
- content: '';
- height: 100%;
- width: 6px;
- left: 0;
- top: 0;
- background-color: nb-theme(color-success);
- border-radius: nb-theme(radius);
- }
- }
> * {
flex: 2;
@@ -58,94 +26,34 @@
}
}
- .date {
- @include nb-for-theme(corporate) {
- color: nb-theme(color-fg-heading);
- }
- }
-
- .value {
- color: nb-theme(color-fg-heading);
- }
-
.delta {
display: flex;
- padding-left: 0.5rem;
- font-size: 1rem;
align-items: center;
&::before {
content: '';
right: 100%;
- margin-right: 0.7rem;
+ @include nb-ltr(margin-right, 0.7rem);
@include nb-rtl(margin-left, 0.7rem);
- @include nb-rtl(margin-right, 0);
border-left: 5px solid transparent;
border-right: 5px solid transparent;
}
&.down {
- color: text-danger();
+ color: nb-theme(color-danger-default);
&::before {
bottom: 5px;
- border-top: 6px solid text-danger();
+ border-top: 6px solid nb-theme(color-danger-default);
}
}
&.up {
- color: text-success();
+ color: nb-theme(color-success-default);
&::before {
top: 5px;
- border-bottom: 6px solid text-success();
- }
- }
- }
-
- @include nb-for-theme(cosmic) {
- .traffic-list li {
- &:hover {
- &::before {
- $color-top: nb-theme(btn-success-bg);
- $color-bottom: btn-hero-success-left-color();
-
- background-image: linear-gradient(to top, $color-top, $color-bottom);
- box-shadow: 0 0 16px -2px btn-hero-success-middle-color();
- }
- }
- }
- }
-
- @include nb-for-theme(corporate) {
- .traffic-list li {
- border-color: nb-theme(tabs-separator);
-
- &:first-child {
- border-top:
- nb-theme(list-item-border-width)
- nb-theme(card-header-border-type)
- nb-theme(separator);
- }
-
- &:hover {
- &::before {
- background-color: nb-theme(color-primary);
- }
- }
- }
-
- .date {
- color: nb-theme(color-fg-heading);
- }
-
- .delta {
- &.up {
- color: text-primary();
-
- &::before {
- border-bottom-color: text-primary();
- }
+ border-bottom: 6px solid nb-theme(color-success-default);
}
}
}
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 afca0293..4e225305 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,16 +1,6 @@
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 59efc123..ec6dd22f 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
@@ -5,12 +5,11 @@
display: flex;
align-items: center;
justify-content: space-between;
- padding: 0.675rem 4rem 0.5rem 1.25rem;
- @include nb-rtl(padding-right, 1.25rem);
+ padding: nb-theme(card-padding);
+ padding-top: 0.45rem;
+ padding-bottom: 0.45rem;
+
+ @include nb-ltr(padding-right, 4rem);
@include nb-rtl(padding-left, 4rem);
}
-
- .dropdown {
- min-width: 120px;
- }
}
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 0bdf41e8..1b11ab71 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
@@ -3,14 +3,14 @@
-
+
-
+
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 f88832db..42f55746 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
@@ -1,19 +1,12 @@
@import '../../../@theme/styles/themes';
@include nb-install-component() {
- .nb-arrow-up, .nb-arrow-down {
+ .toggle-icon {
position: absolute;
- top: 0;
- right: 0;
+ top: 1rem;
+ right: 1.25rem;
@include nb-rtl(right, auto);
- @include nb-rtl(left, 0);
- padding: 1.5rem;
+ @include nb-rtl(left, 1.25rem);
cursor: pointer;
}
-
- nb-card-back {
- ::ng-deep nb-card-header {
- border: none;
- }
- }
}