Skip to content

Commit

Permalink
feat(app): update Nebular to the latest 2.0.1 version (#1868)
Browse files Browse the repository at this point in the history 
Closes #1866.
  • Loading branch information
@nnixaa
nnixaa authored Oct 5, 2018
1 parent a721fd8 commit 16bcc90
Show file tree
Hide file tree
Showing 44 changed files with 74 additions and 56 deletions.
31 changes: 22 additions & 9 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/app/@theme/components/footer/footer.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion src/app/@theme/components/header/header.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/app/@theme/components/switcher/switcher.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion .../@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/app/@theme/layouts/one-column/one-column.layout.scss
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/app/@theme/layouts/sample/sample.layout.scss
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/app/@theme/layouts/three-columns/three-columns.layout.scss
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/app/@theme/layouts/two-columns/two-columns.layout.scss
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
3 changes: 3 additions & 0 deletions src/app/@theme/styles/styles.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/components/notifications/notifications.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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() {

Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/dashboard/contacts/contacts.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/dashboard/dashboard.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/app/pages/dashboard/electricity/electricity.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {

Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/dashboard/rooms/player/player.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/dashboard/rooms/rooms.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/dashboard/security-cameras/security-cameras.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/dashboard/solar/solar.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/dashboard/status-card/status-card.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/dashboard/temperature/temperature.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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() {

Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/dashboard/weather/weather.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/e-commerce/charts-panel/chart-panel-summary/chart-panel-summary.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/e-commerce/country-orders/country-orders.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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() {

Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/e-commerce/country-orders/map/country-orders-map.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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() {

Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/e-commerce/legend-chart/legend-chart.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/e-commerce/slide-out/slide-out.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...pp/pages/e-commerce/traffic-reveal-card/front-side/traffic-bar/traffic-bar.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-front-card.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/e-commerce/visitors-analytics/visitors-analytics.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/forms/form-inputs/form-inputs.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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() {

Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/ui-features/buttons/action-groups/action-groups.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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() {

Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/ui-features/buttons/button-groups/button-groups.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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() {

Expand Down
4 changes: 2 additions & 2 deletions src/app/pages/ui-features/buttons/buttons.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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/ {
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '../../../../@theme/styles/themes';
@import '~@nebular/theme/styles/global/bootstrap/buttons';
@import '~@nebular/bootstrap/styles/buttons';

@include nb-install-component() {

Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '../../../../@theme/styles/themes';
@import '~@nebular/theme/styles/global/bootstrap/buttons';
@import '~@nebular/bootstrap/styles/buttons';

@include nb-install-component() {

Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss
View file
Original file line number Diff line number Diff line change
@@ -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() {

Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '../../../../@theme/styles/themes';
@import '~@nebular/theme/styles/global/bootstrap/buttons';
@import '~@nebular/bootstrap/styles/buttons';

@include nb-install-component() {

Expand Down
Loading

0 comments on commit 16bcc90

Please sign in to comment.