diff --git a/src/app/@theme/components/footer/footer.component.scss b/src/app/@theme/components/footer/footer.component.scss index 07c4e56c..881a280c 100644 --- a/src/app/@theme/components/footer/footer.component.scss +++ b/src/app/@theme/components/footer/footer.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../styles/themes'; @include nb-install-component() { width: 100%; diff --git a/src/app/@theme/components/header/header.component.scss b/src/app/@theme/components/header/header.component.scss index a682e304..79592bef 100644 --- a/src/app/@theme/components/header/header.component.scss +++ b/src/app/@theme/components/header/header.component.scss @@ -1,4 +1,4 @@ -@import '../../styles/variables'; +@import '../../styles/themes'; @include nb-install-component() { display: flex; diff --git a/src/app/@theme/components/theme-settings/theme-settings.component.scss b/src/app/@theme/components/theme-settings/theme-settings.component.scss index 2e33cf0f..823d537c 100644 --- a/src/app/@theme/components/theme-settings/theme-settings.component.scss +++ b/src/app/@theme/components/theme-settings/theme-settings.component.scss @@ -1,4 +1,4 @@ -@import '../../styles/variables'; +@import '../../styles/themes'; @include nb-install-component() { .settings-row { 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 1724f929..c0c1f958 100644 --- a/src/app/@theme/layouts/one-column/one-column.layout.scss +++ b/src/app/@theme/layouts/one-column/one-column.layout.scss @@ -1,4 +1,4 @@ -@import '../../styles/variables'; +@import '../../styles/themes'; @include nb-install-root-component() { diff --git a/src/app/@theme/layouts/sample/sample.layout.scss b/src/app/@theme/layouts/sample/sample.layout.scss index d6d1d9f6..209b2ad0 100644 --- a/src/app/@theme/layouts/sample/sample.layout.scss +++ b/src/app/@theme/layouts/sample/sample.layout.scss @@ -1,4 +1,4 @@ -@import '../../styles/variables'; +@import '../../styles/themes'; @include nb-install-root-component() { 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 2c69f61d..6beabe58 100644 --- a/src/app/@theme/layouts/three-columns/three-columns.layout.scss +++ b/src/app/@theme/layouts/three-columns/three-columns.layout.scss @@ -1,4 +1,4 @@ -@import '../../styles/variables'; +@import '../../styles/themes'; @include nb-install-root-component() { 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 2c69f61d..6beabe58 100644 --- a/src/app/@theme/layouts/two-columns/two-columns.layout.scss +++ b/src/app/@theme/layouts/two-columns/two-columns.layout.scss @@ -1,4 +1,4 @@ -@import '../../styles/variables'; +@import '../../styles/themes'; @include nb-install-root-component() { diff --git a/src/app/@theme/styles/global.scss b/src/app/@theme/styles/global.scss deleted file mode 100644 index e342bce4..00000000 --- a/src/app/@theme/styles/global.scss +++ /dev/null @@ -1,17 +0,0 @@ -@mixin ngx-global-theme() { - // any global, non-component styles go here -} - -.nb-theme-cosmic { - -} - -//global styles for the whole application -[class^='col-'] { - padding: 0 0.75rem; -} - -.row { - margin-right: -0.75rem; - margin-left: -0.75rem; -} diff --git a/src/app/@theme/styles/styles.scss b/src/app/@theme/styles/styles.scss index 70f2ad79..54469887 100644 --- a/src/app/@theme/styles/styles.scss +++ b/src/app/@theme/styles/styles.scss @@ -1,16 +1,25 @@ // themes - our custom or/and out of the box themes -@import 'variables'; +@import 'themes'; // framework component themes (styles tied to theme variables) @import '~@nebular/theme/styles/globals'; @import '~@nebular/auth/styles/all'; -// custom global styles -@import 'global'; - // install the framework and custom global styles @include nb-install() { + + // framework global styles @include nb-theme-global(); @include nb-auth-global(); - @include ngx-global-theme(); + + // other global styles + + [class^='col-'] { + padding: 0 0.75rem; + } + + .row { + margin-right: -0.75rem; + margin-left: -0.75rem; + } }; diff --git a/src/app/@theme/styles/variables.scss b/src/app/@theme/styles/themes.scss similarity index 83% rename from src/app/@theme/styles/variables.scss rename to src/app/@theme/styles/themes.scss index ab8c334e..18996b8a 100644 --- a/src/app/@theme/styles/variables.scss +++ b/src/app/@theme/styles/themes.scss @@ -1,11 +1,9 @@ // @nebular theming framework @import '~@nebular/theme/styles/theming'; -// @nebular our of the box themes +// @nebular out of the box themes @import '~@nebular/theme/styles/themes'; -// TODO: rename into themes - -// which themes you what to enable (empty to enable all - not recommended) +// which themes you what to enable (empty to enable all) $nb-enabled-themes: (default, light, cosmic); $nb-themes: nb-register-theme(( diff --git a/src/app/pages/charts/chartjs/chartjs.component.scss b/src/app/pages/charts/chartjs/chartjs.component.scss index c5ed53d3..b3203e62 100644 --- a/src/app/pages/charts/chartjs/chartjs.component.scss +++ b/src/app/pages/charts/chartjs/chartjs.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @include nb-install-component() { } diff --git a/src/app/pages/charts/d3/d3.component.scss b/src/app/pages/charts/d3/d3.component.scss index c5ed53d3..b3203e62 100644 --- a/src/app/pages/charts/d3/d3.component.scss +++ b/src/app/pages/charts/d3/d3.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @include nb-install-component() { } diff --git a/src/app/pages/charts/echarts/echarts.component.scss b/src/app/pages/charts/echarts/echarts.component.scss index 8c70fe4a..025b4b5f 100644 --- a/src/app/pages/charts/echarts/echarts.component.scss +++ b/src/app/pages/charts/echarts/echarts.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @include nb-install-component() { ngx-echarts-pie, diff --git a/src/app/pages/components/notifications/notifications.component.scss b/src/app/pages/components/notifications/notifications.component.scss index 0e7327bc..1810821c 100644 --- a/src/app/pages/components/notifications/notifications.component.scss +++ b/src/app/pages/components/notifications/notifications.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @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 fb8f00a9..71554d7c 100644 --- a/src/app/pages/dashboard/contacts/contacts.component.scss +++ b/src/app/pages/dashboard/contacts/contacts.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @import '~@nebular/theme/styles/global/bootstrap/hero-buttons'; @include nb-install-component() { diff --git a/src/app/pages/dashboard/dashboard.component.scss b/src/app/pages/dashboard/dashboard.component.scss index 44ba75f0..990402a2 100644 --- a/src/app/pages/dashboard/dashboard.component.scss +++ b/src/app/pages/dashboard/dashboard.component.scss @@ -1,4 +1,4 @@ -@import '../../@theme/styles/variables'; +@import '../../@theme/styles/themes'; @include nb-install-component() { .solar-card nb-card-header { diff --git a/src/app/pages/dashboard/electricity/electricity-chart/electricity-chart.component.scss b/src/app/pages/dashboard/electricity/electricity-chart/electricity-chart.component.scss index 800b5fc0..098d6f7d 100644 --- a/src/app/pages/dashboard/electricity/electricity-chart/electricity-chart.component.scss +++ b/src/app/pages/dashboard/electricity/electricity-chart/electricity-chart.component.scss @@ -1,4 +1,4 @@ -@import '../../../../@theme/styles/variables'; +@import '../../../../@theme/styles/themes'; @include nb-install-component() { diff --git a/src/app/pages/dashboard/electricity/electricity.component.scss b/src/app/pages/dashboard/electricity/electricity.component.scss index fe8d11e3..8f956a90 100644 --- a/src/app/pages/dashboard/electricity/electricity.component.scss +++ b/src/app/pages/dashboard/electricity/electricity.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @import '~@nebular/theme/components/card/card.component.theme'; @import '~@nebular/theme/styles/global/typography/typography'; diff --git a/src/app/pages/dashboard/player/player.component.scss b/src/app/pages/dashboard/player/player.component.scss index e598df60..8acb6198 100644 --- a/src/app/pages/dashboard/player/player.component.scss +++ b/src/app/pages/dashboard/player/player.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @include nb-install-component() { diff --git a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.scss b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.scss index 2c37b513..0e8d33e7 100644 --- a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.scss +++ b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.scss @@ -1,4 +1,4 @@ -@import '../../../../@theme/styles/variables'; +@import '../../../../@theme/styles/themes'; @include nb-install-component() { :host { diff --git a/src/app/pages/dashboard/rooms/rooms.component.scss b/src/app/pages/dashboard/rooms/rooms.component.scss index 8aa6a6b6..9ac77277 100644 --- a/src/app/pages/dashboard/rooms/rooms.component.scss +++ b/src/app/pages/dashboard/rooms/rooms.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @include nb-install-component() { 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 00b37086..6ef38869 100644 --- a/src/app/pages/dashboard/security-cameras/security-cameras.component.scss +++ b/src/app/pages/dashboard/security-cameras/security-cameras.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @include nb-install-component() { nb-card-header { diff --git a/src/app/pages/dashboard/solar/solar.component.scss b/src/app/pages/dashboard/solar/solar.component.scss index 524b8f13..5a132729 100644 --- a/src/app/pages/dashboard/solar/solar.component.scss +++ b/src/app/pages/dashboard/solar/solar.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @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 f93ad169..25697104 100644 --- a/src/app/pages/dashboard/status-card/status-card.component.scss +++ b/src/app/pages/dashboard/status-card/status-card.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @import '~@nebular/theme/styles/global/bootstrap/hero-buttons'; @include nb-install-component() { diff --git a/src/app/pages/dashboard/team/team.component.scss b/src/app/pages/dashboard/team/team.component.scss index f955f948..f443e86a 100644 --- a/src/app/pages/dashboard/team/team.component.scss +++ b/src/app/pages/dashboard/team/team.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @include nb-install-component() { 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 4d3840f3..ed17c6e8 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,4 +1,4 @@ -@import '../../../../@theme/styles/variables'; +@import '../../../../@theme/styles/themes'; @import '~@nebular/theme/styles/global/bootstrap/hero-buttons'; @include nb-install-component() { diff --git a/src/app/pages/dashboard/temperature/temperature.component.scss b/src/app/pages/dashboard/temperature/temperature.component.scss index 24dccd28..9e38c951 100644 --- a/src/app/pages/dashboard/temperature/temperature.component.scss +++ b/src/app/pages/dashboard/temperature/temperature.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @include nb-install-component() { diff --git a/src/app/pages/dashboard/traffic/traffic.component.scss b/src/app/pages/dashboard/traffic/traffic.component.scss index 1f5955f0..592b4a53 100644 --- a/src/app/pages/dashboard/traffic/traffic.component.scss +++ b/src/app/pages/dashboard/traffic/traffic.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @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 11136e90..83ec07ef 100644 --- a/src/app/pages/dashboard/weather/weather.component.scss +++ b/src/app/pages/dashboard/weather/weather.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @include nb-install-component() { 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 da3cb81f..df17b402 100644 --- a/src/app/pages/forms/form-inputs/form-inputs.component.scss +++ b/src/app/pages/forms/form-inputs/form-inputs.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @include nb-install-component() { diff --git a/src/app/pages/maps/bubble/bubble-map.component.scss b/src/app/pages/maps/bubble/bubble-map.component.scss index f9c64a43..1497a0ae 100644 --- a/src/app/pages/maps/bubble/bubble-map.component.scss +++ b/src/app/pages/maps/bubble/bubble-map.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @include nb-install-component() { diff --git a/src/app/pages/maps/gmaps/gmaps.component.scss b/src/app/pages/maps/gmaps/gmaps.component.scss index 512862a5..9b35d07c 100644 --- a/src/app/pages/maps/gmaps/gmaps.component.scss +++ b/src/app/pages/maps/gmaps/gmaps.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @include nb-install-component() { diff --git a/src/app/pages/maps/leaflet/leaflet.component.scss b/src/app/pages/maps/leaflet/leaflet.component.scss index 5bfcd7d0..71b5e4ab 100644 --- a/src/app/pages/maps/leaflet/leaflet.component.scss +++ b/src/app/pages/maps/leaflet/leaflet.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @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 72a217f9..b6b6eefd 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,4 +1,4 @@ -@import '../../../../@theme/styles/variables'; +@import '../../../../@theme/styles/themes'; @import '~@nebular/theme/components/card/card.component.theme'; @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 2afa274f..d4ababd7 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,4 +1,4 @@ -@import '../../../../@theme/styles/variables'; +@import '../../../../@theme/styles/themes'; @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 d3ec759c..9069a8df 100644 --- a/src/app/pages/ui-features/buttons/buttons.component.scss +++ b/src/app/pages/ui-features/buttons/buttons.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @import '~@nebular/theme/styles/global/bootstrap/buttons'; @include nb-install-component() { 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 8c667d83..e9c66357 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,4 +1,4 @@ -@import '../../../../@theme/styles/variables'; +@import '../../../../@theme/styles/themes'; @import '~@nebular/theme/styles/global/bootstrap/buttons'; @include nb-install-component() { diff --git a/src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.scss b/src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.scss index bdbff272..99f065a0 100644 --- a/src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.scss +++ b/src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.scss @@ -1,4 +1,4 @@ -@import '../../../../@theme/styles/variables'; +@import '../../../../@theme/styles/themes'; @include nb-install-component() { text-align: center; 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 2fb7dcb0..188562a1 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,4 +1,4 @@ -@import '../../../../@theme/styles/variables'; +@import '../../../../@theme/styles/themes'; @import '~@nebular/theme/styles/global/bootstrap/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 446d3344..61effdf2 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,4 +1,4 @@ -@import '../../../../@theme/styles/variables'; +@import '../../../../@theme/styles/themes'; @include nb-install-component() { nb-action { 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 96f779c7..b83e1270 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,4 +1,4 @@ -@import '../../../../@theme/styles/variables'; +@import '../../../../@theme/styles/themes'; @import '~@nebular/theme/styles/global/bootstrap/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 1b3f3555..2cbeeb54 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,4 +1,4 @@ -@import '../../../../@theme/styles/variables'; +@import '../../../../@theme/styles/themes'; @import '~@nebular/theme/styles/global/bootstrap/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 30cda6f2..f742e51d 100644 --- a/src/app/pages/ui-features/tabs/tabs.component.scss +++ b/src/app/pages/ui-features/tabs/tabs.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @include nb-install-component() { nb-tabset { diff --git a/src/app/pages/ui-features/typography/typography.component.scss b/src/app/pages/ui-features/typography/typography.component.scss index 3ad23b03..d3f8133b 100644 --- a/src/app/pages/ui-features/typography/typography.component.scss +++ b/src/app/pages/ui-features/typography/typography.component.scss @@ -1,4 +1,4 @@ -@import '../../../@theme/styles/variables'; +@import '../../../@theme/styles/themes'; @include nb-install-component() {