From 16bcc90d572ff83cd5be9897ffa445914fa1a3af Mon Sep 17 00:00:00 2001 From: Dmitry Nehaychik <4dmitr@gmail.com> Date: Fri, 5 Oct 2018 13:20:30 +0300 Subject: [PATCH] feat(app): update Nebular to the latest 2.0.1 version (#1868) Closes #1866. --- package-lock.json | 31 +++++++++++++------ package.json | 8 +++-- .../components/footer/footer.component.scss | 2 +- .../components/header/header.component.scss | 2 +- .../switcher/switcher.component.scss | 4 +-- .../theme-switcher-list.component.scss | 2 +- .../layouts/one-column/one-column.layout.scss | 2 +- .../@theme/layouts/sample/sample.layout.scss | 2 +- .../three-columns/three-columns.layout.scss | 2 +- .../two-columns/two-columns.layout.scss | 2 +- src/app/@theme/styles/styles.scss | 3 ++ .../notifications.component.scss | 2 +- .../contacts/contacts.component.scss | 2 +- .../pages/dashboard/dashboard.component.scss | 2 +- .../electricity/electricity.component.scss | 4 +-- .../rooms/player/player.component.scss | 2 +- .../dashboard/rooms/rooms.component.scss | 2 +- .../security-cameras.component.scss | 2 +- .../dashboard/solar/solar.component.scss | 2 +- .../status-card/status-card.component.scss | 2 +- .../temperature-dragger.component.scss | 2 +- .../temperature/temperature.component.scss | 2 +- .../dashboard/weather/weather.component.scss | 2 +- .../chart-panel-header.component.scss | 2 +- .../chart-panel-summary.component.scss | 2 +- .../chart/country-orders-chart.component.scss | 2 +- .../country-orders.component.scss | 2 +- .../map/country-orders-map.component.scss | 2 +- .../earning-card-back.component.scss | 2 +- .../legend-chart/legend-chart.component.scss | 2 +- .../slide-out/slide-out.component.scss | 2 +- .../traffic-bar/traffic-bar.component.scss | 2 +- .../traffic-front-card.component.scss | 2 +- .../visitors-analytics.component.scss | 2 +- .../form-inputs/form-inputs.component.scss | 2 +- .../action-groups.component.scss | 2 +- .../button-groups.component.scss | 2 +- .../buttons/buttons.component.scss | 4 +-- .../default-buttons.component.scss | 2 +- .../hero-buttons/hero-buttons.component.scss | 2 +- .../labeled-actions-group.component.scss | 2 +- .../shape-buttons.component.scss | 2 +- .../size-buttons/size-buttons.component.scss | 2 +- .../ui-features/tabs/tabs.component.scss | 2 +- 44 files changed, 74 insertions(+), 56 deletions(-) diff --git a/package-lock.json b/package-lock.json index fd459e63..ad6d4ce6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -510,6 +510,14 @@ "tslib": "^1.9.0" } }, + "@angular/cdk": { + "version": "6.4.7", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-6.4.7.tgz", + "integrity": "sha512-18x0U66fLD5kGQWZ9n3nb75xQouXlWs7kUDaTd8HTrHpT1s2QIAqlLd1KxfrYiVhsEC2jPQaoiae7VnBlcvkBg==", + "requires": { + "tslib": "^1.7.1" + } + }, "@angular/cli": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-6.0.0.tgz", @@ -696,19 +704,24 @@ "dev": true }, "@nebular/auth": { - "version": "2.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@nebular/auth/-/auth-2.0.0-rc.10.tgz", - "integrity": "sha512-5jswHe7CxiLagZu9Mct5oa0FwwelTC2XeHESDUK+tqPO14axikrdM9IFnftMqlQ2NkIMCNeMnIt/91M3dPjGZA==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@nebular/auth/-/auth-2.0.1.tgz", + "integrity": "sha512-YfbkRiCT2mj2N3T3O8KqnhiLebhG8Ixq+AMdtASnEBcHeIn4Of3GfyBMENvHpJfDO7FTdJcrt1//4PE6e6vm5Q==" + }, + "@nebular/bootstrap": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@nebular/bootstrap/-/bootstrap-2.0.1.tgz", + "integrity": "sha512-rL5PF7HmKrPTpG3H2wkgjm1pcxXTcKJW6sLPAtrfkLDatlKsZSBdobrQ1LeqMs2NOay76OAhr37f986iXQstIA==" }, "@nebular/security": { - "version": "2.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@nebular/security/-/security-2.0.0-rc.10.tgz", - "integrity": "sha512-Q8r8k95CdbDlpGXyVojacyVzMmxUzDSGl7XN5ONvalY9CW/cm8ZtCyNBluuadvOVcbyKhgyBSSQw5evo9D06NQ==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@nebular/security/-/security-2.0.1.tgz", + "integrity": "sha512-5TDaEfdSEsAQeFg9S9oQ0+OPtMDWIkxBicIFwqqv/UMcg4or87GCvLWJnc3j2XKFH/GWTUeJ32aGqj1NT5Ul7Q==" }, "@nebular/theme": { - "version": "2.0.0-rc.10", - "resolved": "https://registry.npmjs.org/@nebular/theme/-/theme-2.0.0-rc.10.tgz", - "integrity": "sha512-NG0gSNT8qppdUdNbxdBfiIJSGNKyjAkuL73DgdmDqAcJHzqhqnhIjx5rH0eNhNJDRCJZ9A3NJebKiFGnLRfpVg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@nebular/theme/-/theme-2.0.1.tgz", + "integrity": "sha512-dNbd4dL/wfP/1qsRLaerCqEgQMNsu7zWnxfUj8HyDqxMWQw/2zwDAR0wlZMe5YW7IfVPT3j5HucRmb1oW3VnJQ==", "requires": { "intersection-observer": "0.5.0" } diff --git a/package.json b/package.json index 8d8a7b60..d18796e7 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "dependencies": { "@agm/core": "1.0.0-beta.2", "@angular/animations": "6.0.0", + "@angular/cdk": "^6.4.7", "@angular/common": "6.0.0", "@angular/compiler": "6.0.0", "@angular/core": "6.0.0", @@ -45,9 +46,10 @@ "@angular/platform-browser-dynamic": "6.0.0", "@angular/router": "6.0.0", "@asymmetrik/ngx-leaflet": "3.0.1", - "@nebular/auth": "2.0.0-rc.10", - "@nebular/security": "2.0.0-rc.10", - "@nebular/theme": "2.0.0-rc.10", + "@nebular/auth": "2.0.1", + "@nebular/bootstrap": "2.0.1", + "@nebular/security": "2.0.1", + "@nebular/theme": "2.0.1", "@ng-bootstrap/ng-bootstrap": "1.0.0", "@swimlane/ngx-charts": "7.0.1", "angular-tree-component": "7.2.0", diff --git a/src/app/@theme/components/footer/footer.component.scss b/src/app/@theme/components/footer/footer.component.scss index 78d81144..c5713e2c 100644 --- a/src/app/@theme/components/footer/footer.component.scss +++ b/src/app/@theme/components/footer/footer.component.scss @@ -1,5 +1,5 @@ @import '../../styles/themes'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @import '~bootstrap/scss/mixins/breakpoints'; @include nb-install-component() { diff --git a/src/app/@theme/components/header/header.component.scss b/src/app/@theme/components/header/header.component.scss index 29e9186c..f498f007 100644 --- a/src/app/@theme/components/header/header.component.scss +++ b/src/app/@theme/components/header/header.component.scss @@ -1,6 +1,6 @@ @import '../../styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { display: flex; diff --git a/src/app/@theme/components/switcher/switcher.component.scss b/src/app/@theme/components/switcher/switcher.component.scss index dcca364b..585f007b 100644 --- a/src/app/@theme/components/switcher/switcher.component.scss +++ b/src/app/@theme/components/switcher/switcher.component.scss @@ -1,7 +1,7 @@ @import '../../styles/themes'; -@import '~@nebular/theme/styles/global/bootstrap/hero-buttons'; +@import '~@nebular/bootstrap/styles/hero-buttons'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { .switch-label { diff --git a/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss b/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss index 22fbf1fc..ef168634 100644 --- a/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss +++ b/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss @@ -1,7 +1,7 @@ @import '../../../styles/themes'; @import '~@nebular/theme/styles/core/mixins'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; $icon-color-default: #0bbb79; $icon-color-cosmic: #7958fa; diff --git a/src/app/@theme/layouts/one-column/one-column.layout.scss b/src/app/@theme/layouts/one-column/one-column.layout.scss index 7cf139ca..32733f56 100644 --- a/src/app/@theme/layouts/one-column/one-column.layout.scss +++ b/src/app/@theme/layouts/one-column/one-column.layout.scss @@ -1,6 +1,6 @@ @import '../../styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { nb-layout-column.small { diff --git a/src/app/@theme/layouts/sample/sample.layout.scss b/src/app/@theme/layouts/sample/sample.layout.scss index 2d0b7b4d..1afba257 100644 --- a/src/app/@theme/layouts/sample/sample.layout.scss +++ b/src/app/@theme/layouts/sample/sample.layout.scss @@ -1,6 +1,6 @@ @import '../../styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { nb-layout-column.small { diff --git a/src/app/@theme/layouts/three-columns/three-columns.layout.scss b/src/app/@theme/layouts/three-columns/three-columns.layout.scss index 7cf139ca..32733f56 100644 --- a/src/app/@theme/layouts/three-columns/three-columns.layout.scss +++ b/src/app/@theme/layouts/three-columns/three-columns.layout.scss @@ -1,6 +1,6 @@ @import '../../styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { nb-layout-column.small { diff --git a/src/app/@theme/layouts/two-columns/two-columns.layout.scss b/src/app/@theme/layouts/two-columns/two-columns.layout.scss index 38eab02f..c5eae39a 100644 --- a/src/app/@theme/layouts/two-columns/two-columns.layout.scss +++ b/src/app/@theme/layouts/two-columns/two-columns.layout.scss @@ -1,6 +1,6 @@ @import '../../styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { nb-layout-column.small { diff --git a/src/app/@theme/styles/styles.scss b/src/app/@theme/styles/styles.scss index aa28043c..6721bfb0 100644 --- a/src/app/@theme/styles/styles.scss +++ b/src/app/@theme/styles/styles.scss @@ -4,6 +4,8 @@ // framework component themes (styles tied to theme variables) @import '~@nebular/theme/styles/globals'; @import '~@nebular/auth/styles/all'; +@import '~@nebular/bootstrap/styles/globals'; +// ... // global app font size @import './font-size'; @@ -19,6 +21,7 @@ // framework global styles @include nb-theme-global(); @include nb-auth-global(); + @include nb-bootstrap-global(); // loading progress bar @include ngx-pace-theme(); diff --git a/src/app/pages/components/notifications/notifications.component.scss b/src/app/pages/components/notifications/notifications.component.scss index dcab5016..09a409c5 100644 --- a/src/app/pages/components/notifications/notifications.component.scss +++ b/src/app/pages/components/notifications/notifications.component.scss @@ -1,6 +1,6 @@ @import '../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { diff --git a/src/app/pages/dashboard/contacts/contacts.component.scss b/src/app/pages/dashboard/contacts/contacts.component.scss index e28ce49c..c046d28c 100644 --- a/src/app/pages/dashboard/contacts/contacts.component.scss +++ b/src/app/pages/dashboard/contacts/contacts.component.scss @@ -1,5 +1,5 @@ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/bootstrap/hero-buttons'; +@import '~@nebular/bootstrap/styles/hero-buttons'; @include nb-install-component() { nb-tabset { diff --git a/src/app/pages/dashboard/dashboard.component.scss b/src/app/pages/dashboard/dashboard.component.scss index 508ea730..6aa31a5f 100644 --- a/src/app/pages/dashboard/dashboard.component.scss +++ b/src/app/pages/dashboard/dashboard.component.scss @@ -1,6 +1,6 @@ @import '../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { .solar-card nb-card-header { diff --git a/src/app/pages/dashboard/electricity/electricity.component.scss b/src/app/pages/dashboard/electricity/electricity.component.scss index 593be068..a29d9412 100644 --- a/src/app/pages/dashboard/electricity/electricity.component.scss +++ b/src/app/pages/dashboard/electricity/electricity.component.scss @@ -2,8 +2,8 @@ @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/bootstrap/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/hero-buttons'; +@import '~@nebular/theme/styles/global/breakpoints'; +@import '~@nebular/bootstrap/styles/hero-buttons'; @include nb-install-component() { diff --git a/src/app/pages/dashboard/rooms/player/player.component.scss b/src/app/pages/dashboard/rooms/player/player.component.scss index c94b647f..a28cd1a4 100644 --- a/src/app/pages/dashboard/rooms/player/player.component.scss +++ b/src/app/pages/dashboard/rooms/player/player.component.scss @@ -1,7 +1,7 @@ @import '../../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; @import '~@nebular/theme/components/card/card.component.theme'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @import '~@nebular/theme/styles/core/mixins'; @include nb-install-component() { diff --git a/src/app/pages/dashboard/rooms/rooms.component.scss b/src/app/pages/dashboard/rooms/rooms.component.scss index ebf751c8..6a3ebc1c 100644 --- a/src/app/pages/dashboard/rooms/rooms.component.scss +++ b/src/app/pages/dashboard/rooms/rooms.component.scss @@ -1,6 +1,6 @@ @import '../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { ngx-room-selector { 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 39a762be..a0da3cf4 100644 --- a/src/app/pages/dashboard/security-cameras/security-cameras.component.scss +++ b/src/app/pages/dashboard/security-cameras/security-cameras.component.scss @@ -1,5 +1,5 @@ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @import '~bootstrap/scss/mixins/breakpoints'; @include nb-install-component() { diff --git a/src/app/pages/dashboard/solar/solar.component.scss b/src/app/pages/dashboard/solar/solar.component.scss index 375b93c0..dbffaf00 100644 --- a/src/app/pages/dashboard/solar/solar.component.scss +++ b/src/app/pages/dashboard/solar/solar.component.scss @@ -1,5 +1,5 @@ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @import '~bootstrap/scss/mixins/breakpoints'; @include nb-install-component() { 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 d46ade6f..d17829c0 100644 --- a/src/app/pages/dashboard/status-card/status-card.component.scss +++ b/src/app/pages/dashboard/status-card/status-card.component.scss @@ -1,5 +1,5 @@ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/bootstrap/hero-buttons'; +@import '~@nebular/bootstrap/styles/hero-buttons'; @include nb-install-component() { nb-card { diff --git a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.scss b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.scss index bb1eda53..575ed10f 100644 --- a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.scss +++ b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.scss @@ -1,5 +1,5 @@ @import '../../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/bootstrap/hero-buttons'; +@import '~@nebular/bootstrap/styles/hero-buttons'; @include nb-install-component() { position: relative; diff --git a/src/app/pages/dashboard/temperature/temperature.component.scss b/src/app/pages/dashboard/temperature/temperature.component.scss index 7c94c438..0ab66b3c 100644 --- a/src/app/pages/dashboard/temperature/temperature.component.scss +++ b/src/app/pages/dashboard/temperature/temperature.component.scss @@ -1,6 +1,6 @@ @import '../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { diff --git a/src/app/pages/dashboard/weather/weather.component.scss b/src/app/pages/dashboard/weather/weather.component.scss index 7a5c8cb9..9173cedd 100644 --- a/src/app/pages/dashboard/weather/weather.component.scss +++ b/src/app/pages/dashboard/weather/weather.component.scss @@ -1,5 +1,5 @@ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @import '~bootstrap/scss/mixins/breakpoints'; @include nb-install-component() { 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 4b8ff82f..273fdfa1 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 @@ -1,6 +1,6 @@ @import '../../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { .chart-header { diff --git a/src/app/pages/e-commerce/charts-panel/chart-panel-summary/chart-panel-summary.component.scss b/src/app/pages/e-commerce/charts-panel/chart-panel-summary/chart-panel-summary.component.scss index c0e6a762..433b7e9d 100644 --- a/src/app/pages/e-commerce/charts-panel/chart-panel-summary/chart-panel-summary.component.scss +++ b/src/app/pages/e-commerce/charts-panel/chart-panel-summary/chart-panel-summary.component.scss @@ -1,6 +1,6 @@ @import '../../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { .summary-container { diff --git a/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.scss b/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.scss index bb5dcb27..9cb1b3bb 100644 --- a/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.scss +++ b/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.scss @@ -1,6 +1,6 @@ @import '../../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { display: flex; diff --git a/src/app/pages/e-commerce/country-orders/country-orders.component.scss b/src/app/pages/e-commerce/country-orders/country-orders.component.scss index 32721a54..c5f8e697 100644 --- a/src/app/pages/e-commerce/country-orders/country-orders.component.scss +++ b/src/app/pages/e-commerce/country-orders/country-orders.component.scss @@ -1,6 +1,6 @@ @import '../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { diff --git a/src/app/pages/e-commerce/country-orders/map/country-orders-map.component.scss b/src/app/pages/e-commerce/country-orders/map/country-orders-map.component.scss index 2bab183f..2dd905c8 100644 --- a/src/app/pages/e-commerce/country-orders/map/country-orders-map.component.scss +++ b/src/app/pages/e-commerce/country-orders/map/country-orders-map.component.scss @@ -1,6 +1,6 @@ @import '../../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { diff --git a/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.scss b/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.scss index f4a6248f..d835e209 100644 --- a/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.scss +++ b/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.scss @@ -1,6 +1,6 @@ @import '../../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { nb-card-header { diff --git a/src/app/pages/e-commerce/legend-chart/legend-chart.component.scss b/src/app/pages/e-commerce/legend-chart/legend-chart.component.scss index 70979aae..e28a1409 100644 --- a/src/app/pages/e-commerce/legend-chart/legend-chart.component.scss +++ b/src/app/pages/e-commerce/legend-chart/legend-chart.component.scss @@ -1,6 +1,6 @@ @import '../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { .legends { diff --git a/src/app/pages/e-commerce/slide-out/slide-out.component.scss b/src/app/pages/e-commerce/slide-out/slide-out.component.scss index e7e4ab45..973b692f 100644 --- a/src/app/pages/e-commerce/slide-out/slide-out.component.scss +++ b/src/app/pages/e-commerce/slide-out/slide-out.component.scss @@ -1,6 +1,6 @@ @import '../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { $slide-out-container-width: nb-theme(slide-out-container-width); diff --git a/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-bar/traffic-bar.component.scss b/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-bar/traffic-bar.component.scss index 786bed89..d4aeb55f 100644 --- a/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-bar/traffic-bar.component.scss +++ b/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-bar/traffic-bar.component.scss @@ -1,5 +1,5 @@ @import '../../../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/bootstrap/hero-buttons'; +@import '~@nebular/bootstrap/styles/hero-buttons'; @import '~@nebular/theme/styles/global/typography/typography'; $traffic-bar-background-color: #d0d8e3; 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 c27753e7..1bf70c35 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 @@ -2,7 +2,7 @@ @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/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { overflow: auto; 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 72f9cf04..deaef014 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 @@ -1,6 +1,6 @@ @import '../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { position: relative; diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.scss b/src/app/pages/forms/form-inputs/form-inputs.component.scss index 13b822a6..763b31ae 100644 --- a/src/app/pages/forms/form-inputs/form-inputs.component.scss +++ b/src/app/pages/forms/form-inputs/form-inputs.component.scss @@ -1,6 +1,6 @@ @import '../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { diff --git a/src/app/pages/ui-features/buttons/action-groups/action-groups.component.scss b/src/app/pages/ui-features/buttons/action-groups/action-groups.component.scss index f92745a0..6f313676 100644 --- a/src/app/pages/ui-features/buttons/action-groups/action-groups.component.scss +++ b/src/app/pages/ui-features/buttons/action-groups/action-groups.component.scss @@ -1,7 +1,7 @@ @import '../../../../@theme/styles/themes'; @import '~@nebular/theme/components/card/card.component.theme'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { diff --git a/src/app/pages/ui-features/buttons/button-groups/button-groups.component.scss b/src/app/pages/ui-features/buttons/button-groups/button-groups.component.scss index 792767ff..7a8f9b5e 100644 --- a/src/app/pages/ui-features/buttons/button-groups/button-groups.component.scss +++ b/src/app/pages/ui-features/buttons/button-groups/button-groups.component.scss @@ -1,6 +1,6 @@ @import '../../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { diff --git a/src/app/pages/ui-features/buttons/buttons.component.scss b/src/app/pages/ui-features/buttons/buttons.component.scss index f09242df..c972d13f 100644 --- a/src/app/pages/ui-features/buttons/buttons.component.scss +++ b/src/app/pages/ui-features/buttons/buttons.component.scss @@ -1,7 +1,7 @@ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/bootstrap/buttons'; +@import '~@nebular/bootstrap/styles/buttons'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { /deep/ { diff --git a/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.scss b/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.scss index e90bab37..febd1410 100644 --- a/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.scss +++ b/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.scss @@ -1,5 +1,5 @@ @import '../../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/bootstrap/buttons'; +@import '~@nebular/bootstrap/styles/buttons'; @include nb-install-component() { diff --git a/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.scss b/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.scss index 0da57c7b..d2e3cfde 100644 --- a/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.scss +++ b/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.scss @@ -1,5 +1,5 @@ @import '../../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/bootstrap/buttons'; +@import '~@nebular/bootstrap/styles/buttons'; @include nb-install-component() { diff --git a/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss b/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss index f07b3c6f..cbc998dd 100644 --- a/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss +++ b/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss @@ -1,6 +1,6 @@ @import '../../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { diff --git a/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss b/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss index 10f29511..996e6821 100644 --- a/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss +++ b/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss @@ -1,5 +1,5 @@ @import '../../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/bootstrap/buttons'; +@import '~@nebular/bootstrap/styles/buttons'; @include nb-install-component() { diff --git a/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss b/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss index ba0c956c..67d7ae28 100644 --- a/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss +++ b/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss @@ -1,5 +1,5 @@ @import '../../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/bootstrap/buttons'; +@import '~@nebular/bootstrap/styles/buttons'; @include nb-install-component() { diff --git a/src/app/pages/ui-features/tabs/tabs.component.scss b/src/app/pages/ui-features/tabs/tabs.component.scss index 194df306..5fcbccf6 100644 --- a/src/app/pages/ui-features/tabs/tabs.component.scss +++ b/src/app/pages/ui-features/tabs/tabs.component.scss @@ -1,6 +1,6 @@ @import '../../../@theme/styles/themes'; @import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/bootstrap/breakpoints'; +@import '~@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { nb-tabset {