diff --git a/README.md b/README.md index e7267389..e425f645 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# nga-demo +# ngx-admin diff --git a/package-lock.json b/package-lock.json index d0350a7c..c8723aea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "nga-demo", + "name": "ngx-admin", "version": "2.0.0-alpha.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index 18637d7a..df70221b 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "nga-demo", + "name": "ngx-admin", "version": "2.0.0-alpha.0", "license": "MIT", "scripts": { diff --git a/src/app/@core/core.module.ts b/src/app/@core/core.module.ts index fe00bd77..b11c96ea 100644 --- a/src/app/@core/core.module.ts +++ b/src/app/@core/core.module.ts @@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common'; import { throwIfAlreadyLoaded } from './module-import-guard'; import { DataModule } from './data/data.module'; -const NGA_CORE_PROVIDERS = [ +const NB_CORE_PROVIDERS = [ ...DataModule.forRoot().providers, ]; @@ -23,7 +23,7 @@ export class CoreModule { return { ngModule: CoreModule, providers: [ - ...NGA_CORE_PROVIDERS, + ...NB_CORE_PROVIDERS, ], }; } diff --git a/src/app/@theme/components/footer/footer.component.scss b/src/app/@theme/components/footer/footer.component.scss index b64ab82e..07c4e56c 100644 --- a/src/app/@theme/components/footer/footer.component.scss +++ b/src/app/@theme/components/footer/footer.component.scss @@ -1,6 +1,6 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { width: 100%; display: flex; justify-content: space-between; @@ -11,11 +11,11 @@ a { padding: 0.4rem; - color: nga-theme(color-fg); + color: nb-theme(color-fg); transition: color ease-out 0.1s; &:hover { - color: nga-theme(color-fg-heading); + color: nb-theme(color-fg-heading); } } } diff --git a/src/app/@theme/components/header/header.component.scss b/src/app/@theme/components/header/header.component.scss index ac67619d..a682e304 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/variables'; -@include nga-install-component() { +@include nb-install-component() { display: flex; justify-content: space-between; width: 100%; @@ -19,18 +19,18 @@ align-items: center; .navigation { - padding-right: nga-theme(padding); + padding-right: nb-theme(padding); font-size: 2.5rem; } .logo { - padding: 0 nga-theme(padding); + padding: 0 nb-theme(padding); font-size: 1.75rem; - font-weight: nga-theme(font-weight-bolder); - border-left: 1px solid nga-theme(separator); + font-weight: nb-theme(font-weight-bolder); + border-left: 1px solid nb-theme(separator); span { - font-weight: nga-theme(font-weight-normal); + font-weight: nb-theme(font-weight-normal); } } diff --git a/src/app/@theme/components/header/header.component.ts b/src/app/@theme/components/header/header.component.ts index d49e5083..8418d88c 100644 --- a/src/app/@theme/components/header/header.component.ts +++ b/src/app/@theme/components/header/header.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; -import { NgaMenuService, NgaSidebarService } from '@akveo/nga-theme'; -import { NgaThemeService } from '@akveo/nga-theme/services/theme.service'; +import { NbMenuService, NbSidebarService } from '@nebular/theme'; +import { NbThemeService } from '@nebular/theme'; import { UserService } from '../../../@core/data/users.service'; @Component({ @@ -18,21 +18,21 @@ import { UserService } from '../../../@core/data/users.service'; - - - - - - - - - - - + + + + + + + + + + `, }) export class HeaderComponent implements OnInit { @@ -51,9 +51,9 @@ export class HeaderComponent implements OnInit { }, ]; - constructor(private sidebarService: NgaSidebarService, - private menuService: NgaMenuService, - private themeService: NgaThemeService, + constructor(private sidebarService: NbSidebarService, + private menuService: NbMenuService, + private themeService: NbThemeService, private userService: UserService) { } 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 096002ac..2e33cf0f 100644 --- a/src/app/@theme/components/theme-settings/theme-settings.component.scss +++ b/src/app/@theme/components/theme-settings/theme-settings.component.scss @@ -1,6 +1,6 @@ @import '../../styles/variables'; -@include nga-install-component() { +@include nb-install-component() { .settings-row { display: flex; flex-direction: row; @@ -11,10 +11,10 @@ a { font-size: 2rem; margin-right: 1rem; - color: nga-theme(color-white); + color: nb-theme(color-white); &.selected { - color: nga-theme(color-success); + color: nb-theme(color-success); } } } 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 3a9d8295..1724f929 100644 --- a/src/app/@theme/layouts/one-column/one-column.layout.scss +++ b/src/app/@theme/layouts/one-column/one-column.layout.scss @@ -1,18 +1,18 @@ @import '../../styles/variables'; -@include nga-install-root-component() { +@include nb-install-root-component() { - nga-sidebar.menu-sidebar { + nb-sidebar.menu-sidebar { - margin-top: nga-theme(sidebar-header-gap); + margin-top: nb-theme(sidebar-header-gap); /deep/ .main-container { height: - calc(#{nga-theme(sidebar-height)} - #{nga-theme(header-height)} - #{nga-theme(sidebar-header-gap)}) !important; + calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(sidebar-header-gap)}) !important; border-top-right-radius: 0.75rem; } - /deep/ nga-sidebar-header { + /deep/ nb-sidebar-header { padding-bottom: 0.5rem; text-align: center; } @@ -40,7 +40,7 @@ &.compacted { - /deep/ nga-sidebar-header { + /deep/ nb-sidebar-header { padding-left: 0; padding-right: 0; } diff --git a/src/app/@theme/layouts/one-column/one-column.layout.ts b/src/app/@theme/layouts/one-column/one-column.layout.ts index bf6c1af3..b112b9e8 100644 --- a/src/app/@theme/layouts/one-column/one-column.layout.ts +++ b/src/app/@theme/layouts/one-column/one-column.layout.ts @@ -5,28 +5,28 @@ import { Component } from '@angular/core'; selector: 'ngx-one-column-layout', styleUrls: ['./one-column.layout.scss'], template: ` - - + + - + - - + + - - - + + + - + - + - + - - + + `, }) export class OneColumnLayoutComponent { diff --git a/src/app/@theme/layouts/sample/sample.layout.scss b/src/app/@theme/layouts/sample/sample.layout.scss index a9c0b9e8..d6d1d9f6 100644 --- a/src/app/@theme/layouts/sample/sample.layout.scss +++ b/src/app/@theme/layouts/sample/sample.layout.scss @@ -1,12 +1,12 @@ @import '../../styles/variables'; -@include nga-install-root-component() { +@include nb-install-root-component() { - nga-layout-column.small { + nb-layout-column.small { flex: 0.15 !important; } - nga-sidebar.settings-sidebar { + nb-sidebar.settings-sidebar { width: 7rem; /deep/ .main-container { width: 7rem; @@ -21,17 +21,17 @@ } } - nga-sidebar.menu-sidebar { + nb-sidebar.menu-sidebar { - margin-top: nga-theme(sidebar-header-gap); + margin-top: nb-theme(sidebar-header-gap); /deep/ .main-container { height: - calc(#{nga-theme(sidebar-height)} - #{nga-theme(header-height)} - #{nga-theme(sidebar-header-gap)}) !important; + calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(sidebar-header-gap)}) !important; border-top-right-radius: 0.75rem; } - /deep/ nga-sidebar-header { + /deep/ nb-sidebar-header { padding-bottom: 0.5rem; text-align: center; } @@ -59,7 +59,7 @@ &.compacted { - /deep/ nga-sidebar-header { + /deep/ nb-sidebar-header { padding-left: 0; padding-right: 0; } diff --git a/src/app/@theme/layouts/sample/sample.layout.ts b/src/app/@theme/layouts/sample/sample.layout.ts index 1f548239..092c2524 100644 --- a/src/app/@theme/layouts/sample/sample.layout.ts +++ b/src/app/@theme/layouts/sample/sample.layout.ts @@ -1,6 +1,6 @@ import { Component, Input, OnDestroy } from '@angular/core'; import { List } from 'immutable'; -import { NgaMenuItem } from '@akveo/nga-theme'; +import { NbMenuItem } from '@nebular/theme'; import { Subscription } from 'rxjs/Subscription'; import { StateService } from '../../../@core/data/state.service'; @@ -10,52 +10,52 @@ import { StateService } from '../../../@core/data/state.service'; selector: 'ngx-sample-layout', styleUrls: ['./sample.layout.scss'], template: ` - - + + - + - - + - - - + + + - + - + - - - + + + - - - + + + - + - + - - - + + `, }) export class SampleLayoutComponent implements OnDestroy { - subMenu: List = List( + subMenu: List = List( [ { title: 'PAGE LEVEL MENU', 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 a190d4fc..2c69f61d 100644 --- a/src/app/@theme/layouts/three-columns/three-columns.layout.scss +++ b/src/app/@theme/layouts/three-columns/three-columns.layout.scss @@ -1,22 +1,22 @@ @import '../../styles/variables'; -@include nga-install-root-component() { +@include nb-install-root-component() { - nga-layout-column.small { + nb-layout-column.small { flex: 0.15 !important; } - nga-sidebar.menu-sidebar { + nb-sidebar.menu-sidebar { - margin-top: nga-theme(sidebar-header-gap); + margin-top: nb-theme(sidebar-header-gap); /deep/ .main-container { height: - calc(#{nga-theme(sidebar-height)} - #{nga-theme(header-height)} - #{nga-theme(sidebar-header-gap)}) !important; + calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(sidebar-header-gap)}) !important; border-top-right-radius: 0.75rem; } - /deep/ nga-sidebar-header { + /deep/ nb-sidebar-header { padding-bottom: 0.5rem; text-align: center; } @@ -44,7 +44,7 @@ &.compacted { - /deep/ nga-sidebar-header { + /deep/ nb-sidebar-header { padding-left: 0; padding-right: 0; } diff --git a/src/app/@theme/layouts/three-columns/three-columns.layout.ts b/src/app/@theme/layouts/three-columns/three-columns.layout.ts index 80df0dde..0b6207ea 100644 --- a/src/app/@theme/layouts/three-columns/three-columns.layout.ts +++ b/src/app/@theme/layouts/three-columns/three-columns.layout.ts @@ -5,34 +5,34 @@ import { Component } from '@angular/core'; selector: 'ngx-three-columns-layout', styleUrls: ['./three-columns.layout.scss'], template: ` - - + + - + - - + + - - - + + + - - + + - + - + - - + + - + - - + + `, }) export class ThreeColumnsLayoutComponent { 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 a190d4fc..2c69f61d 100644 --- a/src/app/@theme/layouts/two-columns/two-columns.layout.scss +++ b/src/app/@theme/layouts/two-columns/two-columns.layout.scss @@ -1,22 +1,22 @@ @import '../../styles/variables'; -@include nga-install-root-component() { +@include nb-install-root-component() { - nga-layout-column.small { + nb-layout-column.small { flex: 0.15 !important; } - nga-sidebar.menu-sidebar { + nb-sidebar.menu-sidebar { - margin-top: nga-theme(sidebar-header-gap); + margin-top: nb-theme(sidebar-header-gap); /deep/ .main-container { height: - calc(#{nga-theme(sidebar-height)} - #{nga-theme(header-height)} - #{nga-theme(sidebar-header-gap)}) !important; + calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(sidebar-header-gap)}) !important; border-top-right-radius: 0.75rem; } - /deep/ nga-sidebar-header { + /deep/ nb-sidebar-header { padding-bottom: 0.5rem; text-align: center; } @@ -44,7 +44,7 @@ &.compacted { - /deep/ nga-sidebar-header { + /deep/ nb-sidebar-header { padding-left: 0; padding-right: 0; } diff --git a/src/app/@theme/layouts/two-columns/two-columns.layout.ts b/src/app/@theme/layouts/two-columns/two-columns.layout.ts index 95b79e4e..51ea0a0f 100644 --- a/src/app/@theme/layouts/two-columns/two-columns.layout.ts +++ b/src/app/@theme/layouts/two-columns/two-columns.layout.ts @@ -5,32 +5,32 @@ import { Component } from '@angular/core'; selector: 'ngx-two-columns-layout', styleUrls: ['./two-columns.layout.scss'], template: ` - - + + - + - - + + - - - + + + - - + + - + - + - + - + - + `, }) export class TwoColumnsLayoutComponent { diff --git a/src/app/@theme/styles/global.scss b/src/app/@theme/styles/global.scss index 5e1e12ea..e342bce4 100644 --- a/src/app/@theme/styles/global.scss +++ b/src/app/@theme/styles/global.scss @@ -2,7 +2,7 @@ // any global, non-component styles go here } -.nga-theme-cosmic { +.nb-theme-cosmic { } diff --git a/src/app/@theme/styles/styles.scss b/src/app/@theme/styles/styles.scss index 0b340cfb..70f2ad79 100644 --- a/src/app/@theme/styles/styles.scss +++ b/src/app/@theme/styles/styles.scss @@ -2,15 +2,15 @@ @import 'variables'; // framework component themes (styles tied to theme variables) -@import '~@akveo/nga-theme/styles/globals'; -@import '~@akveo/nga-auth/styles/all'; +@import '~@nebular/theme/styles/globals'; +@import '~@nebular/auth/styles/all'; // custom global styles @import 'global'; // install the framework and custom global styles -@include nga-install() { - @include nga-theme-global(); - @include nga-auth-global(); +@include nb-install() { + @include nb-theme-global(); + @include nb-auth-global(); @include ngx-global-theme(); }; diff --git a/src/app/@theme/styles/variables.scss b/src/app/@theme/styles/variables.scss index 30de24cb..14386f67 100644 --- a/src/app/@theme/styles/variables.scss +++ b/src/app/@theme/styles/variables.scss @@ -1,26 +1,26 @@ -// nga theming framework -@import '~@akveo/nga-theme/styles/theming'; -// nga our of the box themes -@import '~@akveo/nga-theme/styles/themes'; +// @nebular theming framework +@import '~@nebular/theme/styles/theming'; +// @nebular our of the box themes +@import '~@nebular/theme/styles/themes'; // which themes you what to enable (empty to enable all - not recommended) -$nga-enabled-themes: (default, light, cosmic); +$nb-enabled-themes: (default, light, cosmic); -$nga-themes: nga-register-theme(( +$nb-themes: nb-register-theme(( // app wise variables for each theme sidebar-header-gap: 2rem, sidebar-header-height: initial, layout-content-width: 1400px, ), default, default); -$nga-themes: nga-register-theme(( +$nb-themes: nb-register-theme(( // app wise variables for each theme sidebar-header-gap: 2rem, sidebar-header-height: initial, layout-content-width: 1400px, ), cosmic, cosmic); -$nga-themes: nga-register-theme(( +$nb-themes: nb-register-theme(( // app wise variables for each theme sidebar-header-gap: 2rem, sidebar-header-height: initial, diff --git a/src/app/@theme/theme.module.ts b/src/app/@theme/theme.module.ts index 52ba553c..73d6242f 100644 --- a/src/app/@theme/theme.module.ts +++ b/src/app/@theme/theme.module.ts @@ -3,17 +3,17 @@ import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { - NgaActionsModule, - NgaCardModule, - NgaLayoutModule, - NgaMenuModule, - NgaRouteTabsetModule, - NgaSearchModule, - NgaSidebarModule, - NgaTabsetModule, - NgaThemeModule, - NgaUserModule, -} from '@akveo/nga-theme'; + NbActionsModule, + NbCardModule, + NbLayoutModule, + NbMenuModule, + NbRouteTabsetModule, + NbSearchModule, + NbSidebarModule, + NbTabsetModule, + NbThemeModule, + NbUserModule, +} from '@nebular/theme'; import { FooterComponent, @@ -34,16 +34,16 @@ import { COSMIC_THEME } from './styles/theme.cosmic'; const BASE_MODULES = [CommonModule, FormsModule, ReactiveFormsModule]; -const NGA_MODULES = [ - NgaCardModule, - NgaLayoutModule, - NgaTabsetModule, - NgaRouteTabsetModule, - NgaMenuModule, - NgaUserModule, - NgaActionsModule, - NgaSearchModule, - NgaSidebarModule, +const NB_MODULES = [ + NbCardModule, + NbLayoutModule, + NbTabsetModule, + NbRouteTabsetModule, + NbMenuModule, + NbUserModule, + NbActionsModule, + NbSearchModule, + NbSidebarModule, ]; const COMPONENTS = [ @@ -60,28 +60,28 @@ const COMPONENTS = [ const PIPES = [CapitalizePipe, PluralPipe, RoundPipe]; -const NGA_THEME_PROVIDERS = [ - ...NgaThemeModule.forRoot( +const NB_THEME_PROVIDERS = [ + ...NbThemeModule.forRoot( { name: 'default', }, [DEFAULT_THEME, COSMIC_THEME], ).providers, - ...NgaSidebarModule.forRoot().providers, - ...NgaSidebarModule.forRoot().providers, - ...NgaMenuModule.forRoot().providers, + ...NbSidebarModule.forRoot().providers, + ...NbSidebarModule.forRoot().providers, + ...NbMenuModule.forRoot().providers, ]; @NgModule({ - imports: [...BASE_MODULES, ...NGA_MODULES], - exports: [...BASE_MODULES, ...NGA_MODULES, ...COMPONENTS, ...PIPES], + imports: [...BASE_MODULES, ...NB_MODULES], + exports: [...BASE_MODULES, ...NB_MODULES, ...COMPONENTS, ...PIPES], declarations: [...COMPONENTS, ...PIPES], }) export class ThemeModule { static forRoot(): ModuleWithProviders { return { ngModule: ThemeModule, - providers: [...NGA_THEME_PROVIDERS], + providers: [...NB_THEME_PROVIDERS], }; } } diff --git a/src/app/pages/charts/chartjs/chartjs-bar-horizontal.component.ts b/src/app/pages/charts/chartjs/chartjs-bar-horizontal.component.ts index 3849d154..6577e989 100644 --- a/src/app/pages/charts/chartjs/chartjs-bar-horizontal.component.ts +++ b/src/app/pages/charts/chartjs/chartjs-bar-horizontal.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-chartjs-bar-horizontal', @@ -26,7 +26,7 @@ export class ChartjsBarHorizontalComponent { chartType: string = 'horizontalBar'; chartOptions: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { const chartjs: any = config.variables.chartjs; diff --git a/src/app/pages/charts/chartjs/chartjs-bar.component.ts b/src/app/pages/charts/chartjs/chartjs-bar.component.ts index ee09fbca..81bc2390 100644 --- a/src/app/pages/charts/chartjs/chartjs-bar.component.ts +++ b/src/app/pages/charts/chartjs/chartjs-bar.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-chartjs-bar', @@ -29,7 +29,7 @@ export class ChartjsBarComponent { ]; chartOptions: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { const chartjs: any = config.variables.chartjs; diff --git a/src/app/pages/charts/chartjs/chartjs-line.component.ts b/src/app/pages/charts/chartjs/chartjs-line.component.ts index b5dc3c2a..34798b9d 100644 --- a/src/app/pages/charts/chartjs/chartjs-line.component.ts +++ b/src/app/pages/charts/chartjs/chartjs-line.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-chartjs-line', @@ -30,7 +30,7 @@ export class ChartjsLineComponent { chatyType: string = 'line'; chartOptions: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { const chartjs: any = config.variables.chartjs; diff --git a/src/app/pages/charts/chartjs/chartjs-multiple-xaxis.component.ts b/src/app/pages/charts/chartjs/chartjs-multiple-xaxis.component.ts index 6ebada2f..83930be5 100644 --- a/src/app/pages/charts/chartjs/chartjs-multiple-xaxis.component.ts +++ b/src/app/pages/charts/chartjs/chartjs-multiple-xaxis.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-chartjs-multiple-xaxis', @@ -94,7 +94,7 @@ export class ChartjsMultipleXaxisComponent { ]; chartOptions: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { const chartjs: any = config.variables.chartjs; diff --git a/src/app/pages/charts/chartjs/chartjs-pie.component.ts b/src/app/pages/charts/chartjs/chartjs-pie.component.ts index 0a66f8ee..04fcfc2a 100644 --- a/src/app/pages/charts/chartjs/chartjs-pie.component.ts +++ b/src/app/pages/charts/chartjs/chartjs-pie.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-chartjs-pie', @@ -24,7 +24,7 @@ export class ChartjsPieComponent { chartData: number[] = [300, 500, 100]; chartOptions: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { const chartjs: any = config.variables.chartjs; diff --git a/src/app/pages/charts/chartjs/chartjs-radar.component.ts b/src/app/pages/charts/chartjs/chartjs-radar.component.ts index 538992d4..5b90e915 100644 --- a/src/app/pages/charts/chartjs/chartjs-radar.component.ts +++ b/src/app/pages/charts/chartjs/chartjs-radar.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-chartjs-radar', @@ -24,7 +24,7 @@ export class ChartjsRadarComponent { chartOptions: any; chartData: any[]; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { const chartjs: any = config.variables.chartjs; diff --git a/src/app/pages/charts/chartjs/chartjs.component.html b/src/app/pages/charts/chartjs/chartjs.component.html index cc8236c5..67555787 100644 --- a/src/app/pages/charts/chartjs/chartjs.component.html +++ b/src/app/pages/charts/chartjs/chartjs.component.html @@ -1,50 +1,50 @@
- - Pie - + + Pie + - - + +
- - Bar - + + Bar + - - + +
- - Line - + + Line + - - + +
- - Multiple x-axis - + + Multiple x-axis + - - + +
- - Bar Horizontal - + + Bar Horizontal + - - + +
- - Radar - + + Radar + - - + +
diff --git a/src/app/pages/charts/chartjs/chartjs.component.scss b/src/app/pages/charts/chartjs/chartjs.component.scss index d189de43..c5ed53d3 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'; -@include nga-install-component() { +@include nb-install-component() { } diff --git a/src/app/pages/charts/d3/d3-advanced-pie.component.ts b/src/app/pages/charts/d3/d3-advanced-pie.component.ts index b702ef97..a8d0ef93 100644 --- a/src/app/pages/charts/d3/d3-advanced-pie.component.ts +++ b/src/app/pages/charts/d3/d3-advanced-pie.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-d3-advanced-pie', @@ -29,7 +29,7 @@ export class D3AdvancedPieComponent { view: any[] = [700, 400]; colorScheme: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { this.colorScheme = { domain: (config.variables.d3).advancedPie, diff --git a/src/app/pages/charts/d3/d3-area-stack.component.ts b/src/app/pages/charts/d3/d3-area-stack.component.ts index f8ffe9e0..89c48463 100644 --- a/src/app/pages/charts/d3/d3-area-stack.component.ts +++ b/src/app/pages/charts/d3/d3-area-stack.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-d3-area-stack', @@ -74,7 +74,7 @@ export class D3AreaStackComponent { yAxisLabel = 'Population'; colorScheme: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { this.colorScheme = { domain: (config.variables.d3).areaStack, diff --git a/src/app/pages/charts/d3/d3-bar.component.ts b/src/app/pages/charts/d3/d3-bar.component.ts index 6b29f3c2..220e02b6 100644 --- a/src/app/pages/charts/d3/d3-bar.component.ts +++ b/src/app/pages/charts/d3/d3-bar.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-d3-bar', @@ -44,7 +44,7 @@ export class D3BarComponent { yAxisLabel = 'Population'; colorScheme: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { this.colorScheme = { domain: (config.variables.d3).bar, diff --git a/src/app/pages/charts/d3/d3-line.component.ts b/src/app/pages/charts/d3/d3-line.component.ts index 841776fb..d051b1b9 100644 --- a/src/app/pages/charts/d3/d3-line.component.ts +++ b/src/app/pages/charts/d3/d3-line.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-d3-line', @@ -71,7 +71,7 @@ export class D3LineComponent { yAxisLabel = 'Population'; colorScheme: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { this.colorScheme = { domain: (config.variables.d3).line, diff --git a/src/app/pages/charts/d3/d3-pie.component.ts b/src/app/pages/charts/d3/d3-pie.component.ts index dc8d1d60..c65ee1d8 100644 --- a/src/app/pages/charts/d3/d3-pie.component.ts +++ b/src/app/pages/charts/d3/d3-pie.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-d3-pie', @@ -39,7 +39,7 @@ export class D3PieComponent { yAxisLabel = 'Population'; colorScheme: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { this.colorScheme = { domain: (config.variables.d3).pie, diff --git a/src/app/pages/charts/d3/d3-polar.component.ts b/src/app/pages/charts/d3/d3-polar.component.ts index 1f8d7afd..2ee953af 100644 --- a/src/app/pages/charts/d3/d3-polar.component.ts +++ b/src/app/pages/charts/d3/d3-polar.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-d3-polar', @@ -84,7 +84,7 @@ export class D3PolarComponent { yAxisLabel = 'Population'; colorScheme: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { this.colorScheme = { domain: (config.variables.d3).polar, diff --git a/src/app/pages/charts/d3/d3.component.html b/src/app/pages/charts/d3/d3.component.html index ddfa5014..85a0fa27 100644 --- a/src/app/pages/charts/d3/d3.component.html +++ b/src/app/pages/charts/d3/d3.component.html @@ -1,50 +1,50 @@
- - Pie - + + Pie + - - + +
- - Bar - + + Bar + - - + +
- - Line - + + Line + - - + +
- - Advanced Pie - + + Advanced Pie + - - + +
- - Area Chart - + + Area Chart + - - + +
- - Polar Chart - + + Polar Chart + - - + +
diff --git a/src/app/pages/charts/d3/d3.component.scss b/src/app/pages/charts/d3/d3.component.scss index d189de43..c5ed53d3 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'; -@include nga-install-component() { +@include nb-install-component() { } diff --git a/src/app/pages/charts/echarts/echarts-area-stack.component.ts b/src/app/pages/charts/echarts/echarts-area-stack.component.ts index 93c27191..2a030c52 100644 --- a/src/app/pages/charts/echarts/echarts-area-stack.component.ts +++ b/src/app/pages/charts/echarts/echarts-area-stack.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-echarts-area-stack', @@ -10,7 +10,7 @@ import { NgaThemeService } from '@akveo/nga-theme'; export class EchartsAreaStackComponent { options: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { const echarts: any = config.variables.echarts; diff --git a/src/app/pages/charts/echarts/echarts-bar-animation.component.ts b/src/app/pages/charts/echarts/echarts-bar-animation.component.ts index 036bebc0..f0a8aa75 100644 --- a/src/app/pages/charts/echarts/echarts-bar-animation.component.ts +++ b/src/app/pages/charts/echarts/echarts-bar-animation.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-echarts-bar-animation', @@ -10,7 +10,7 @@ import { NgaThemeService } from '@akveo/nga-theme'; export class EchartsBarAnimationComponent { options: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { const xAxisData = []; const data1 = []; diff --git a/src/app/pages/charts/echarts/echarts-bar.component.ts b/src/app/pages/charts/echarts/echarts-bar.component.ts index f7e6c1ed..a43c586b 100644 --- a/src/app/pages/charts/echarts/echarts-bar.component.ts +++ b/src/app/pages/charts/echarts/echarts-bar.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-echarts-bar', @@ -10,7 +10,7 @@ import { NgaThemeService } from '@akveo/nga-theme'; export class EchartsBarComponent { options: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { const echarts: any = config.variables.echarts; diff --git a/src/app/pages/charts/echarts/echarts-line.component.ts b/src/app/pages/charts/echarts/echarts-line.component.ts index b00d206c..568273d0 100644 --- a/src/app/pages/charts/echarts/echarts-line.component.ts +++ b/src/app/pages/charts/echarts/echarts-line.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-echarts-line', @@ -10,7 +10,7 @@ import { NgaThemeService } from '@akveo/nga-theme'; export class EchartsLineComponent { options: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { const echarts: any = config.variables.echarts; diff --git a/src/app/pages/charts/echarts/echarts-multiple-xaxis.component.ts b/src/app/pages/charts/echarts/echarts-multiple-xaxis.component.ts index 0fa09d46..2873b154 100644 --- a/src/app/pages/charts/echarts/echarts-multiple-xaxis.component.ts +++ b/src/app/pages/charts/echarts/echarts-multiple-xaxis.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-echarts-multiple-xaxis', @@ -10,7 +10,7 @@ import { NgaThemeService } from '@akveo/nga-theme'; export class EchartsMultipleXaxisComponent { options: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { const echarts: any = config.variables.echarts; diff --git a/src/app/pages/charts/echarts/echarts-pie.component.ts b/src/app/pages/charts/echarts/echarts-pie.component.ts index b54e9aa2..cc1d1ed5 100644 --- a/src/app/pages/charts/echarts/echarts-pie.component.ts +++ b/src/app/pages/charts/echarts/echarts-pie.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-echarts-pie', @@ -10,7 +10,7 @@ import { NgaThemeService } from '@akveo/nga-theme'; export class EchartsPieComponent { options: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { const echarts: any = config.variables.echarts; diff --git a/src/app/pages/charts/echarts/echarts-radar.component.ts b/src/app/pages/charts/echarts/echarts-radar.component.ts index 02011f8e..f8fb5b1d 100644 --- a/src/app/pages/charts/echarts/echarts-radar.component.ts +++ b/src/app/pages/charts/echarts/echarts-radar.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-echarts-radar', @@ -10,7 +10,7 @@ import { NgaThemeService } from '@akveo/nga-theme'; export class EchartsRadarComponent { options: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { const echarts: any = config.variables.echarts; diff --git a/src/app/pages/charts/echarts/echarts.component.html b/src/app/pages/charts/echarts/echarts.component.html index 36e2b643..8d90841e 100644 --- a/src/app/pages/charts/echarts/echarts.component.html +++ b/src/app/pages/charts/echarts/echarts.component.html @@ -1,58 +1,58 @@
- - Pie - + + Pie + - - + +
- - Bar - + + Bar + - - + +
- - Line - + + Line + - - + +
- - Multiple x-axis - + + Multiple x-axis + - - + +
- - Area Stack - + + Area Stack + - - + +
- - Bar Animation - + + Bar Animation + - - + +
- - Radar - + + Radar + - - + +
diff --git a/src/app/pages/charts/echarts/echarts.component.scss b/src/app/pages/charts/echarts/echarts.component.scss index 7cc7fb4b..8c70fe4a 100644 --- a/src/app/pages/charts/echarts/echarts.component.scss +++ b/src/app/pages/charts/echarts/echarts.component.scss @@ -1,6 +1,6 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { ngx-echarts-pie, ngx-echarts-bar, ngx-echarts-line { diff --git a/src/app/pages/components/components.module.ts b/src/app/pages/components/components.module.ts index a1726ec9..39797481 100644 --- a/src/app/pages/components/components.module.ts +++ b/src/app/pages/components/components.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { NgaCheckboxModule } from '@akveo/nga-theme'; +import { NbCheckboxModule } from '@nebular/theme'; import { TreeModule } from 'ng2-tree'; import { ToasterModule } from 'angular2-toaster'; @@ -14,7 +14,7 @@ import { ComponentsRoutingModule, routedComponents } from './components-routing. ComponentsRoutingModule, TreeModule, ToasterModule, - NgaCheckboxModule, + NbCheckboxModule, ], declarations: [ ...routedComponents, diff --git a/src/app/pages/components/notifications/notifications.component.html b/src/app/pages/components/notifications/notifications.component.html index c18648ac..12d3f022 100644 --- a/src/app/pages/components/notifications/notifications.component.html +++ b/src/app/pages/components/notifications/notifications.component.html @@ -1,8 +1,8 @@ - - + + Toaster configuration - - + +
@@ -66,17 +66,17 @@
-
Newest on top
-
Hide on click
-
Prevent arising of duplicate toast
-
Close button
+
Newest on top
+
Hide on click
+
Prevent arising of duplicate toast
+
Close button
- + - + - - + + diff --git a/src/app/pages/components/notifications/notifications.component.scss b/src/app/pages/components/notifications/notifications.component.scss index 95f91b9e..0e7327bc 100644 --- a/src/app/pages/components/notifications/notifications.component.scss +++ b/src/app/pages/components/notifications/notifications.component.scss @@ -1,8 +1,8 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { - nga-card-footer { + nb-card-footer { padding-bottom: 0.25rem; button { diff --git a/src/app/pages/components/tree/tree.component.html b/src/app/pages/components/tree/tree.component.html index 72e09131..bf5f7c48 100644 --- a/src/app/pages/components/tree/tree.component.html +++ b/src/app/pages/components/tree/tree.component.html @@ -1,10 +1,10 @@
- - Tree - + + Tree + - - + +
diff --git a/src/app/pages/dashboard/contacts/contacts.component.html b/src/app/pages/dashboard/contacts/contacts.component.html index 9233ddf9..9d305bdc 100644 --- a/src/app/pages/dashboard/contacts/contacts.component.html +++ b/src/app/pages/dashboard/contacts/contacts.component.html @@ -1,16 +1,16 @@ - - - + + +
- +
- - + +
- + {{ c.time }}
- - - + + + diff --git a/src/app/pages/dashboard/contacts/contacts.component.scss b/src/app/pages/dashboard/contacts/contacts.component.scss index 87211c8d..fb8f00a9 100644 --- a/src/app/pages/dashboard/contacts/contacts.component.scss +++ b/src/app/pages/dashboard/contacts/contacts.component.scss @@ -1,14 +1,14 @@ @import '../../../@theme/styles/variables'; -@import '~@akveo/nga-theme/styles/global/bootstrap/hero-buttons'; +@import '~@nebular/theme/styles/global/bootstrap/hero-buttons'; -@include nga-install-component() { - nga-tabset { +@include nb-install-component() { + nb-tabset { height: 100%; display: flex; flex-direction: column; } - nga-tab { + nb-tab { flex: 1; overflow-y: auto; padding: 0; @@ -18,9 +18,9 @@ display: flex; align-items: center; justify-content: space-between; - color: nga-theme(color-fg); + color: nb-theme(color-fg); padding: 1rem; - border-bottom: 1px solid nga-theme(separator); + border-bottom: 1px solid nb-theme(separator); } .i-contact { @@ -30,24 +30,24 @@ .time { font-size: 0.875rem; - font-weight: nga-theme(font-weight-light); + font-weight: nb-theme(font-weight-light); text-transform: uppercase; } - nga-user /deep/ { + nb-user /deep/ { .info-container { margin-left: 0.875rem; } .user-name { font-size: 1.25rem; - font-weight: nga-theme(font-weight-bolder); - color: nga-theme(color-fg-heading); + font-weight: nb-theme(font-weight-bolder); + color: nb-theme(color-fg-heading); } .user-title { font-size: 0.875rem; - font-weight: nga-theme(font-weight-light); + font-weight: nb-theme(font-weight-light); text-transform: uppercase; } } diff --git a/src/app/pages/dashboard/dashboard.component.html b/src/app/pages/dashboard/dashboard.component.html index 49409782..4026e872 100644 --- a/src/app/pages/dashboard/dashboard.component.html +++ b/src/app/pages/dashboard/dashboard.component.html @@ -46,12 +46,12 @@
- - Solar Energy Consumption - + + Solar Energy Consumption + - - + +
diff --git a/src/app/pages/dashboard/dashboard.component.scss b/src/app/pages/dashboard/dashboard.component.scss index df6a1e19..44ba75f0 100644 --- a/src/app/pages/dashboard/dashboard.component.scss +++ b/src/app/pages/dashboard/dashboard.component.scss @@ -1,7 +1,7 @@ @import '../../@theme/styles/variables'; -@include nga-install-component() { - .solar-card nga-card-header { +@include nb-install-component() { + .solar-card nb-card-header { border: none; padding-bottom: 0; } diff --git a/src/app/pages/dashboard/dashboard.module.ts b/src/app/pages/dashboard/dashboard.module.ts index 53b77f50..014271c7 100644 --- a/src/app/pages/dashboard/dashboard.module.ts +++ b/src/app/pages/dashboard/dashboard.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { NgaTabsetModule, NgaUserModule } from '@akveo/nga-theme'; +import { NbTabsetModule, NbUserModule } from '@nebular/theme'; import { AngularEchartsModule } from 'ngx-echarts'; import { SharedModule } from '../../shared.module'; @@ -22,8 +22,8 @@ import { TrafficChartComponent } from './traffic/traffic-chart.component'; @NgModule({ imports: [ - NgaTabsetModule, - NgaUserModule, + NbTabsetModule, + NbUserModule, SharedModule, AngularEchartsModule, ], 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 194c69da..800b5fc0 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,6 +1,6 @@ @import '../../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { display: block; flex: 1; diff --git a/src/app/pages/dashboard/electricity/electricity-chart/electricity-chart.component.ts b/src/app/pages/dashboard/electricity/electricity-chart/electricity-chart.component.ts index f5e0cc5a..8474afc1 100644 --- a/src/app/pages/dashboard/electricity/electricity-chart/electricity-chart.component.ts +++ b/src/app/pages/dashboard/electricity/electricity-chart/electricity-chart.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; declare const echarts: any; @@ -14,7 +14,7 @@ export class ElectricityChartComponent { option: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { const points = [490, 490, 495, 500, 505, 510, 520, 530, 550, 580, 630, 720, 800, 840, 860, 870, 870, 860, 840, 800, 720, 200, 145, 130, 130, diff --git a/src/app/pages/dashboard/electricity/electricity.component.html b/src/app/pages/dashboard/electricity/electricity.component.html index 350d3c62..5898eb83 100644 --- a/src/app/pages/dashboard/electricity/electricity.component.html +++ b/src/app/pages/dashboard/electricity/electricity.component.html @@ -1,12 +1,12 @@ - +
Electricity
Consumption
- - + +
{{ month.month }} @@ -16,8 +16,8 @@ {{ month.kWatts }} kWh / {{ month.cost }} USD
- - + +
@@ -53,4 +53,4 @@
- + diff --git a/src/app/pages/dashboard/electricity/electricity.component.scss b/src/app/pages/dashboard/electricity/electricity.component.scss index efbdcaff..fe8d11e3 100644 --- a/src/app/pages/dashboard/electricity/electricity.component.scss +++ b/src/app/pages/dashboard/electricity/electricity.component.scss @@ -1,10 +1,10 @@ @import '../../../@theme/styles/variables'; -@import '~@akveo/nga-theme/components/card/card.component.theme'; -@import '~@akveo/nga-theme/styles/global/typography/typography'; +@import '~@nebular/theme/components/card/card.component.theme'; +@import '~@nebular/theme/styles/global/typography/typography'; -@include nga-install-component() { +@include nb-install-component() { - nga-card { + nb-card { display: flex; flex-direction: row; } @@ -15,22 +15,22 @@ width: 20rem; height: 100%; z-index: 2; - box-shadow: nga-theme(card-shadow); + box-shadow: nb-theme(card-shadow); } .table-header { - @include nga-card-header(); + @include nb-card-header(); font-size: 1.5rem; .subtitle { - color: nga-theme(color-fg); - font-family: nga-theme(font-primary); + color: nb-theme(color-fg); + font-family: nb-theme(font-primary); font-size: 1.125rem; - font-weight: nga-theme(font-weight-light); + font-weight: nb-theme(font-weight-light); } } - nga-tabset /deep/ { + nb-tabset /deep/ { flex: 1; overflow: hidden; display: flex; @@ -42,13 +42,13 @@ } ul li a { - font-weight: nga-theme(font-weight-bolder); + font-weight: nb-theme(font-weight-bolder); padding: 0.75rem 1rem; } ul li.active { - background-color: nga-theme(color-primary); - border-radius: nga-theme(radius); + background-color: nb-theme(color-primary); + border-radius: nb-theme(radius); a { font-size: 1.5rem; @@ -58,7 +58,7 @@ } } - nga-tab { + nb-tab { flex: 1; overflow-y: auto; } @@ -71,16 +71,16 @@ padding: 1rem; &:not(:first-child) { - border-top: 1px solid nga-theme(separator); + border-top: 1px solid nb-theme(separator); } .month { display: inline-block; width: 2.75rem; - font-family: nga-theme(font-secondary); + font-family: nb-theme(font-secondary); font-size: 1.25rem; - font-weight: nga-theme(font-weight-bolder); - color: nga-theme(color-fg-heading); + font-weight: nb-theme(font-weight-bolder); + color: nb-theme(color-fg-heading); } .delta { @@ -115,13 +115,13 @@ .results { font-size: 0.875rem; - font-weight: nga-theme(font-weight-light); + font-weight: nb-theme(font-weight-light); b { - font-family: nga-theme(font-secondary); + font-family: nb-theme(font-secondary); font-size: 1rem; - font-weight: nga-theme(font-weight-bolder); - color: nga-theme(color-fg-heading); + font-weight: nb-theme(font-weight-bolder); + color: nb-theme(color-fg-heading); } } } @@ -129,7 +129,7 @@ .chart-container { flex: 1; height: 100%; - background-image: nga-theme(radial-gradient); + background-image: nb-theme(radial-gradient); display: flex; flex-direction: column; } @@ -151,24 +151,24 @@ .subtitle { font-size: 1.125rem; - font-weight: nga-theme(font-weight-light); + font-weight: nb-theme(font-weight-light); } .value { - font-family: nga-theme(font-secondary); + font-family: nb-theme(font-secondary); font-size: 2rem; - font-weight: nga-theme(font-weight-bolder); - color: nga-theme(color-fg-heading); + font-weight: nb-theme(font-weight-bolder); + color: nb-theme(color-fg-heading); &.dollar { - color: nga-theme(color-fg-highlight); + color: nb-theme(color-fg-highlight); } } .unit { - font-family: nga-theme(font-secondary); + font-family: nb-theme(font-secondary); font-size: 1.25rem; - font-weight: nga-theme(font-weight-light); + font-weight: nb-theme(font-weight-light); } } diff --git a/src/app/pages/dashboard/player/player.component.scss b/src/app/pages/dashboard/player/player.component.scss index 6d35a6bb..e598df60 100644 --- a/src/app/pages/dashboard/player/player.component.scss +++ b/src/app/pages/dashboard/player/player.component.scss @@ -1,6 +1,6 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { .player { flex: 1; @@ -10,9 +10,9 @@ display: flex; line-height: 2rem; font-size: 1.25rem; - font-family: nga-theme(font-secondary); - font-weight: nga-theme(font-weight-bolder); - color: nga-theme(color-fg-heading); + font-family: nb-theme(font-secondary); + font-weight: nb-theme(font-weight-bolder); + color: nb-theme(color-fg-heading); padding: 1.25rem; .player-menu { @@ -33,7 +33,7 @@ background-position: center; height: 94px; width: 30%; - box-shadow: nga-theme(card-shadow); + box-shadow: nb-theme(card-shadow); } .artist-details { @@ -43,16 +43,16 @@ margin-left: 1.25rem; .artist-name { - color: nga-theme(color-fg-heading); + color: nb-theme(color-fg-heading); font-size: 1.5rem; - font-family: nga-theme(font-secondary); - font-weight: nga-theme(font-weight-bold); + font-family: nb-theme(font-secondary); + font-weight: nb-theme(font-weight-bold); } .song-name { - font-family: nga-theme(font-main); + font-family: nb-theme(font-main); font-size: 1.125rem; - color: nga-theme(color-fg); + color: nb-theme(color-fg); } } } @@ -86,12 +86,12 @@ display: flex; justify-content: space-around; font-size: 4rem; - color: nga-theme(color-fg-heading); + color: nb-theme(color-fg-heading); padding: 2.5rem 0; - border-bottom: 1px solid nga-theme(separator); + border-bottom: 1px solid nb-theme(separator); .prev { - color: nga-theme(color-fg); + color: nb-theme(color-fg); } } @@ -99,16 +99,16 @@ display: flex; justify-content: space-around; font-size: 4rem; - color: nga-theme(color-fg); + color: nb-theme(color-fg); padding: 2rem 0; - border-bottom: 1px solid nga-theme(separator); + border-bottom: 1px solid nb-theme(separator); .minus:hover { - color: nga-theme(color-fg-heading); + color: nb-theme(color-fg-heading); } .plus:hover { - color: nga-theme(color-fg-heading); + color: nb-theme(color-fg-heading); } .volume-items { @@ -126,7 +126,7 @@ .volume-item::before { content: ''; width: 4px; - background-color: nga-theme(separator); + background-color: nb-theme(separator); height: 30%; border-radius: 1rem; transition: 0.3s; @@ -166,8 +166,8 @@ } .btn.active { - background-color: nga-theme(card-bg); - color: nga-theme(color-fg); + background-color: nb-theme(card-bg); + color: nb-theme(color-fg); } .btn:first-child { @@ -177,7 +177,7 @@ .btn:last-child { border-top-right-radius: 0; - border-bottom-right-radius: nga-theme(card-border-radius); + border-bottom-right-radius: nb-theme(card-border-radius); } } } 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 d80e3aae..2c37b513 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,6 +1,6 @@ @import '../../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { :host { display: block; align-items: center; @@ -81,9 +81,9 @@ .rooms-card-header { line-height: 2rem; font-size: 1.25rem; - font-family: nga-theme(font-secondary); - font-weight: nga-theme(font-weight-bolder); - color: nga-theme(color-fg-heading); + font-family: nb-theme(font-secondary); + font-weight: nb-theme(font-weight-bolder); + color: nb-theme(color-fg-heading); padding: 1.25rem; } } diff --git a/src/app/pages/dashboard/rooms/rooms.component.scss b/src/app/pages/dashboard/rooms/rooms.component.scss index 74288598..8aa6a6b6 100644 --- a/src/app/pages/dashboard/rooms/rooms.component.scss +++ b/src/app/pages/dashboard/rooms/rooms.component.scss @@ -1,18 +1,18 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { ngx-room-selector { width: 65%; - background-image: nga-theme(radial-gradient); + background-image: nb-theme(radial-gradient); } ngx-player { flex: 1; - box-shadow: nga-theme(card-shadow); + box-shadow: nb-theme(card-shadow); } - nga-card { + nb-card { display: flex; flex-direction: row; } diff --git a/src/app/pages/dashboard/rooms/rooms.component.ts b/src/app/pages/dashboard/rooms/rooms.component.ts index e11c145f..056743b6 100644 --- a/src/app/pages/dashboard/rooms/rooms.component.ts +++ b/src/app/pages/dashboard/rooms/rooms.component.ts @@ -4,10 +4,10 @@ import { Component } from '@angular/core'; selector: 'ngx-rooms', styleUrls: ['./rooms.component.scss'], template: ` - + - + `, }) export class RoomsComponent { diff --git a/src/app/pages/dashboard/security-cameras/security-cameras.component.html b/src/app/pages/dashboard/security-cameras/security-cameras.component.html index 249e4326..418ab60a 100644 --- a/src/app/pages/dashboard/security-cameras/security-cameras.component.html +++ b/src/app/pages/dashboard/security-cameras/security-cameras.component.html @@ -1,5 +1,5 @@ - - + +
Security Cameras @@ -11,8 +11,8 @@
- - + +
{{ selectedCamera.title }} @@ -24,21 +24,21 @@ {{ camera.title }}
- - - - + + + + Pause - - + + Log View - - + + 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 0ec3e68a..00b37086 100644 --- a/src/app/pages/dashboard/security-cameras/security-cameras.component.scss +++ b/src/app/pages/dashboard/security-cameras/security-cameras.component.scss @@ -1,16 +1,16 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { - nga-card-header { +@include nb-install-component() { + nb-card-header { padding: 0; border: none; } - nga-card-body { + nb-card-body { padding: 0; } - nga-card-footer { + nb-card-footer { padding: 1rem 0; border: none; } @@ -33,21 +33,21 @@ display: flex; flex-direction: column; justify-content: center; - color: nga-theme(color-fg); + color: nb-theme(color-fg); } a:first-child { - border-left: 1px solid nga-theme(separator); + border-left: 1px solid nb-theme(separator); } a:last-child { - border-top-right-radius: nga-theme(card-border-radius); + border-top-right-radius: nb-theme(card-border-radius); } a.active { - background-color: nga-theme(color-bg-active); - color: nga-theme(color-fg-highlight); - text-shadow: 0 0 12px rgba(nga-theme(color-fg-highlight), 0.4); + background-color: nb-theme(color-bg-active); + color: nb-theme(color-fg-highlight); + text-shadow: 0 0 12px rgba(nb-theme(color-fg-highlight), 0.4); border: none; } } @@ -101,17 +101,17 @@ } } - nga-action { + nb-action { i { - color: nga-theme(color-fg); + color: nb-theme(color-fg); font-size: 2.5rem; margin-right: 1rem; } span { - font-family: nga-theme(font-family-secondary); - font-weight: nga-theme(font-weight-bold); - color: nga-theme(color-fg-heading); + font-family: nb-theme(font-family-secondary); + font-weight: nb-theme(font-weight-bold); + color: nb-theme(color-fg-heading); text-transform: uppercase; } } diff --git a/src/app/pages/dashboard/solar/solar.component.scss b/src/app/pages/dashboard/solar/solar.component.scss index 6f28d2fb..524b8f13 100644 --- a/src/app/pages/dashboard/solar/solar.component.scss +++ b/src/app/pages/dashboard/solar/solar.component.scss @@ -1,6 +1,6 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { display: flex; height: 100%; diff --git a/src/app/pages/dashboard/solar/solar.component.ts b/src/app/pages/dashboard/solar/solar.component.ts index 832f4b39..452a40af 100644 --- a/src/app/pages/dashboard/solar/solar.component.ts +++ b/src/app/pages/dashboard/solar/solar.component.ts @@ -1,5 +1,5 @@ import { Component, Input } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; declare const echarts: any; @@ -27,7 +27,7 @@ export class SolarComponent { this.option.series[1].data[0].value = value; } - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { const solarTheme: any = config.variables.solar; 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 7ce58dc4..f93ad169 100644 --- a/src/app/pages/dashboard/status-card/status-card.component.scss +++ b/src/app/pages/dashboard/status-card/status-card.component.scss @@ -1,19 +1,19 @@ @import '../../../@theme/styles/variables'; -@import '~@akveo/nga-theme/styles/global/bootstrap/hero-buttons'; +@import '~@nebular/theme/styles/global/bootstrap/hero-buttons'; -@include nga-install-component() { - nga-card { +@include nb-install-component() { + nb-card { flex-direction: row; align-items: center; height: 6rem; overflow: visible; - $bevel: btn-hero-bevel(nga-theme(card-bg)); + $bevel: btn-hero-bevel(nb-theme(card-bg)); $shadow: btn-hero-shadow(); box-shadow: $bevel, $shadow; transition: all 0.1s ease-out; - $border-radius: nga-theme(card-border-radius); + $border-radius: nb-theme(card-border-radius); .icon-container { display: flex; align-items: center; @@ -23,7 +23,7 @@ font-size: 4em; border-radius: $border-radius 0 0 $border-radius; transition: all 0.1s ease-out, color 0s; - color: nga-theme(color-white); + color: nb-theme(color-white); &.primary { @include btn-hero-primary-gradient(); @@ -44,7 +44,7 @@ } &:hover { - background: lighten(nga-theme(card-bg), 5%); + background: lighten(nb-theme(card-bg), 5%); .icon-container { &.primary { @@ -64,7 +64,7 @@ &:active { box-shadow: none; - background: nga-theme(card-bg); + background: nb-theme(card-bg); .icon-container { &.primary, &.success, &.info, &.warning { @@ -86,10 +86,10 @@ } &.off { - color: nga-theme(card-fg); + color: nb-theme(card-fg); .icon-container { - color: nga-theme(card-fg); + color: nb-theme(card-fg); &.primary, &.success, &.info, &.warning { box-shadow: none; @@ -98,10 +98,10 @@ } .details { - border-left: 1px solid nga-theme(separator); + border-left: 1px solid nb-theme(separator); } .title { - color: nga-theme(card-fg); + color: nb-theme(card-fg); } } @@ -115,17 +115,17 @@ } .title { - font-family: nga-theme(font-secondary); + font-family: nb-theme(font-secondary); font-size: 1.5rem; - font-weight: nga-theme(font-weight-bolder); - color: nga-theme(card-fg-heading); + font-weight: nb-theme(font-weight-bolder); + color: nb-theme(card-fg-heading); } .status { font-size: 1.125rem; - font-weight: nga-theme(font-weight-light); + font-weight: nb-theme(font-weight-light); text-transform: uppercase; - color: nga-theme(card-fg); + color: nb-theme(card-fg); } } } 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 d2ae62d1..8406b1db 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: ` - +
@@ -13,7 +13,7 @@ import { Component, Input } from '@angular/core';
{{ title }}
{{ on ? 'ON' : 'OFF' }}
- + `, }) export class StatusCardComponent { diff --git a/src/app/pages/dashboard/team/team.component.html b/src/app/pages/dashboard/team/team.component.html index 000d701a..72bd210a 100644 --- a/src/app/pages/dashboard/team/team.component.html +++ b/src/app/pages/dashboard/team/team.component.html @@ -1,4 +1,4 @@ - +
- + diff --git a/src/app/pages/dashboard/team/team.component.scss b/src/app/pages/dashboard/team/team.component.scss index 6f1f4ea4..f955f948 100644 --- a/src/app/pages/dashboard/team/team.component.scss +++ b/src/app/pages/dashboard/team/team.component.scss @@ -1,14 +1,14 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { .team-photo { background-image: url('~/assets/images/team.png'); background-position: center; background-size: cover; position: relative; - border-top-left-radius: nga-theme(card-border-radius); - border-top-right-radius: nga-theme(card-border-radius); + border-top-left-radius: nb-theme(card-border-radius); + border-top-right-radius: nb-theme(card-border-radius); flex: 1; max-height: 50%; @@ -20,7 +20,7 @@ bottom: -2rem; right: 1rem; border-radius: 50%; - box-shadow: 0 4px 10px 0 rgba(nga-theme(layout-bg), 0.4), 0 0 12px 0 rgba(nga-theme(color-fg-highlight), 0.2); + box-shadow: 0 4px 10px 0 rgba(nb-theme(layout-bg), 0.4), 0 0 12px 0 rgba(nb-theme(color-fg-highlight), 0.2); } } @@ -28,8 +28,8 @@ padding: 1.5rem 1.5rem 0; .team-title { - color: nga-theme(color-fg-heading); - font-family: nga-theme(font-secondary); + color: nb-theme(color-fg-heading); + font-family: nb-theme(font-secondary); h2 { margin: 0; @@ -38,14 +38,14 @@ .team-subtitle { margin-bottom: 1rem; - color: nga-theme(color-fg); - font-weight: nga-theme(font-weight-light); + color: nb-theme(color-fg); + font-weight: nb-theme(font-weight-light); } .team-bio { text-align: justify; - color: nga-theme(color-fg-text); - font-weight: nga-theme(font-weight-light); + color: nb-theme(color-fg-text); + font-weight: nb-theme(font-weight-light); } } @@ -56,7 +56,7 @@ a { text-decoration: none; - color: nga-theme(color-fg); + color: nb-theme(color-fg); i { font-size: 1.75rem; 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 6b1d4071..4d3840f3 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,7 +1,7 @@ @import '../../../../@theme/styles/variables'; -@import '~@akveo/nga-theme/styles/global/bootstrap/hero-buttons'; +@import '~@nebular/theme/styles/global/bootstrap/hero-buttons'; -@include nga-install-component() { +@include nb-install-component() { display: flex; position: relative; @@ -18,7 +18,7 @@ height: 88%; top: 13%; left: 6%; - background-color: lighten(nga-theme(layout-bg), 2%); + background-color: lighten(nb-theme(layout-bg), 2%); border-radius: 50%; z-index: 1; @@ -32,7 +32,7 @@ position: absolute; width: 5.25rem; height: 5.25rem; - background-color: nga-theme(card-bg); + background-color: nb-theme(card-bg); border-radius: 50%; bottom: 2%; left: 50%; @@ -42,24 +42,24 @@ display: flex; align-items: center; justify-content: center; - box-shadow: nga-theme(card-shadow); + box-shadow: nb-theme(card-shadow); cursor: pointer; font-size: 2.5rem; - color: nga-theme(color-fg-heading); + color: nb-theme(color-fg-heading); text-shadow: 0 0 6px rgba(255, 255, 255, 0.5); transition: all 0.1s ease-out; &:hover { - background-color: lighten(nga-theme(card-bg), 5%); + background-color: lighten(nb-theme(card-bg), 5%); } &:active { - background-color: darken(nga-theme(card-bg), 5%); + background-color: darken(nb-theme(card-bg), 5%); box-shadow: none; } &.off { - color: nga-theme(color-fg); + color: nb-theme(color-fg); text-shadow: none; } } diff --git a/src/app/pages/dashboard/temperature/temperature.component.html b/src/app/pages/dashboard/temperature/temperature.component.html index add605bd..d1b376d9 100644 --- a/src/app/pages/dashboard/temperature/temperature.component.html +++ b/src/app/pages/dashboard/temperature/temperature.component.html @@ -1,7 +1,7 @@ - - + + - +
- + - +
- - - + + + diff --git a/src/app/pages/dashboard/temperature/temperature.component.scss b/src/app/pages/dashboard/temperature/temperature.component.scss index a2e0b871..24dccd28 100644 --- a/src/app/pages/dashboard/temperature/temperature.component.scss +++ b/src/app/pages/dashboard/temperature/temperature.component.scss @@ -1,12 +1,12 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { - nga-card { - background-image: nga-theme(radial-gradient); + nb-card { + background-image: nb-theme(radial-gradient); } - nga-tabset { + nb-tabset { display: flex; flex-direction: column; height: 100%; @@ -16,7 +16,7 @@ } } - nga-tab.content-active { + nb-tab.content-active { display: flex; flex-direction: column; justify-content: space-between; @@ -43,10 +43,10 @@ .value { position: relative; - color: nga-theme(color-fg-heading); - font-family: nga-theme(font-secondary); + color: nb-theme(color-fg-heading); + font-family: nb-theme(font-secondary); font-size: 4rem; - font-weight: nga-theme(font-weight-bolder); + font-weight: nb-theme(font-weight-bolder); &.temperature::before { position: absolute; @@ -60,20 +60,20 @@ content: '%'; bottom: 0.5rem; right: -2.5rem; - color: nga-theme(color-fg); + color: nb-theme(color-fg); font-size: 2.5rem; - font-weight: nga-theme(font-weight-light); + font-weight: nb-theme(font-weight-light); } } .desc { - color: nga-theme(color-fg); - font-weight: nga-theme(font-weight-light); + color: nb-theme(color-fg); + font-weight: nb-theme(font-weight-light); } &.off { .value { - color: nga-theme(color-fg); + color: nb-theme(color-fg); letter-spacing: 0.25rem; padding-left: 0.5rem; @@ -97,15 +97,15 @@ align-items: center; justify-content: center; - border-color: nga-theme(form-control-border-color); + border-color: nb-theme(form-control-border-color); height: 4.5rem; padding: 0; margin-bottom: 0; &.active { - border-color: nga-theme(color-fg-highlight); - box-shadow: 0 2px 12px 0 rgba(nga-theme(color-fg-highlight), 0.25); - background-color: rgba(nga-theme(color-fg-highlight), 0.25); + border-color: nb-theme(color-fg-highlight); + box-shadow: 0 2px 12px 0 rgba(nb-theme(color-fg-highlight), 0.25); + background-color: rgba(nb-theme(color-fg-highlight), 0.25); } i { diff --git a/src/app/pages/dashboard/temperature/temperature.component.ts b/src/app/pages/dashboard/temperature/temperature.component.ts index f12d5042..441a8971 100644 --- a/src/app/pages/dashboard/temperature/temperature.component.ts +++ b/src/app/pages/dashboard/temperature/temperature.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-temperature', @@ -18,7 +18,7 @@ export class TemperatureComponent { colors: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { this.colors = config.variables; }); diff --git a/src/app/pages/dashboard/traffic/traffic-chart.component.ts b/src/app/pages/dashboard/traffic/traffic-chart.component.ts index ffc62fbe..69706fce 100644 --- a/src/app/pages/dashboard/traffic/traffic-chart.component.ts +++ b/src/app/pages/dashboard/traffic/traffic-chart.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; declare const echarts: any; @@ -18,7 +18,7 @@ export class TrafficChartComponent { types = ['week', 'month', 'year']; option: any = {}; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { const trafficTheme: any = config.variables.traffic; diff --git a/src/app/pages/dashboard/traffic/traffic.component.scss b/src/app/pages/dashboard/traffic/traffic.component.scss index 92ffb415..1f5955f0 100644 --- a/src/app/pages/dashboard/traffic/traffic.component.scss +++ b/src/app/pages/dashboard/traffic/traffic.component.scss @@ -1,8 +1,8 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { - nga-card-header { + nb-card-header { display: flex; align-items: center; justify-content: space-between; @@ -10,13 +10,13 @@ border: none; } - nga-card-body { + nb-card-body { overflow: hidden; } /deep/ canvas { - border-bottom-left-radius: nga-theme(card-border-radius); - border-bottom-right-radius: nga-theme(card-border-radius); + border-bottom-left-radius: nb-theme(card-border-radius); + border-bottom-right-radius: nb-theme(card-border-radius); } .echart { diff --git a/src/app/pages/dashboard/traffic/traffic.component.ts b/src/app/pages/dashboard/traffic/traffic.component.ts index 9ca56b1d..2a953cc6 100644 --- a/src/app/pages/dashboard/traffic/traffic.component.ts +++ b/src/app/pages/dashboard/traffic/traffic.component.ts @@ -4,8 +4,8 @@ import { Component } from '@angular/core'; selector: 'ngx-traffic', styleUrls: ['./traffic.component.scss'], template: ` - - + + Traffic Consumption
- - + + - - + + `, }) export class TrafficComponent { diff --git a/src/app/pages/dashboard/weather/weather.component.html b/src/app/pages/dashboard/weather/weather.component.html index e61e8c42..fcabc4e4 100644 --- a/src/app/pages/dashboard/weather/weather.component.html +++ b/src/app/pages/dashboard/weather/weather.component.html @@ -1,5 +1,5 @@ - - + +
Minsk
@@ -56,5 +56,5 @@ 21° - - + + diff --git a/src/app/pages/dashboard/weather/weather.component.scss b/src/app/pages/dashboard/weather/weather.component.scss index 911a013b..11136e90 100644 --- a/src/app/pages/dashboard/weather/weather.component.scss +++ b/src/app/pages/dashboard/weather/weather.component.scss @@ -1,30 +1,30 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { - nga-card { - background-image: nga-theme(radial-gradient); + nb-card { + background-image: nb-theme(radial-gradient); } - nga-card-body { + nb-card-body { height: 100%; padding: 2rem; - color: nga-theme(color-fg); + color: nb-theme(color-fg); } .location { - font-family: nga-theme(font-secondary); + font-family: nb-theme(font-secondary); font-size: 3rem; line-height: 3rem; - font-weight: nga-theme(font-weight-light); - color: nga-theme(color-fg-heading); + font-weight: nb-theme(font-weight-light); + color: nb-theme(color-fg-heading); } .date { - font-family: nga-theme(font-main); + font-family: nb-theme(font-main); font-size: 1.25rem; line-height: 1.25rem; - font-weight: nga-theme(font-weight-light); + font-weight: nb-theme(font-weight-light); } .daily-forecast { @@ -38,9 +38,9 @@ .temperature { font-size: 5rem; - font-weight: nga-theme(font-weight-bolder); - font-family: nga-theme(font-secondary); - color: nga-theme(color-fg-heading); + font-weight: nb-theme(font-weight-bolder); + font-family: nb-theme(font-secondary); + color: nb-theme(color-fg-heading); display: flex; flex-direction: column; justify-content: center; @@ -66,16 +66,16 @@ text-align: center; .parameter-name { - font-family: nga-theme(font-main); + font-family: nb-theme(font-main); font-size: 1.25rem; - font-weight: nga-theme(font-weight-light); + font-weight: nb-theme(font-weight-light); line-height: 2rem; } .parameter-value { - font-family: nga-theme(font-secondary); - color: nga-theme(color-fg-heading); - font-weight: nga-theme(font-weight-bolder); + font-family: nb-theme(font-secondary); + color: nb-theme(color-fg-heading); + font-weight: nb-theme(font-weight-bolder); } } } @@ -93,9 +93,9 @@ .caption { text-transform: uppercase; - font-family: nga-theme(font-secondary); - color: nga-theme(color-fg-heading); - font-weight: nga-theme(font-weight-bold); + font-family: nb-theme(font-secondary); + color: nb-theme(color-fg-heading); + font-weight: nb-theme(font-weight-bold); font-size: 1.25rem; } @@ -105,9 +105,9 @@ } .temperature { - color: nga-theme(color-fg-heading); - font-family: nga-theme(font-secondary); - font-weight: nga-theme(font-weight-bold); + color: nb-theme(color-fg-heading); + font-family: nb-theme(font-secondary); + font-weight: nb-theme(font-weight-bold); font-size: 1.25rem; } } diff --git a/src/app/pages/editors/ckeditor/ckeditor.component.ts b/src/app/pages/editors/ckeditor/ckeditor.component.ts index 05a52a2f..68601333 100644 --- a/src/app/pages/editors/ckeditor/ckeditor.component.ts +++ b/src/app/pages/editors/ckeditor/ckeditor.component.ts @@ -6,11 +6,11 @@ import 'ckeditor'; @Component({ selector: 'ngx-ckeditor', template: ` - - + + - - + + `, }) export class CKEditorComponent { diff --git a/src/app/pages/editors/tiny-mce/tiny-mce.component.ts b/src/app/pages/editors/tiny-mce/tiny-mce.component.ts index 6d9fd723..121a5fdb 100644 --- a/src/app/pages/editors/tiny-mce/tiny-mce.component.ts +++ b/src/app/pages/editors/tiny-mce/tiny-mce.component.ts @@ -3,11 +3,11 @@ import { Component } from '@angular/core'; @Component({ selector: 'ngx-tiny-mce-page', template: ` - - + + - - + + `, }) export class TinyMCEComponent { 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 376c4a96..d5052335 100644 --- a/src/app/pages/forms/form-inputs/form-inputs.component.html +++ b/src/app/pages/forms/form-inputs/form-inputs.component.html @@ -1,8 +1,8 @@
- - Default Inputs - + + Default Inputs +
@@ -39,11 +39,11 @@
- - - - Input Groups - + + + + Input Groups +
@ @@ -84,11 +84,11 @@
- - - - Selects - + + + + Selects +
- - + +
- - Input Styles - + + Input Styles +
@@ -125,11 +125,11 @@
- - - - Validation States - + + + + Validation States +
@@ -140,9 +140,9 @@
- Checkbox with Success - Checkbox with Warning - Checkbox with Danger + Checkbox with Success + Checkbox with Warning + Checkbox with Danger
@@ -153,11 +153,11 @@
- - - - Checkboxes & Radios - + + + + Checkboxes & Radios +
- Disabled Checkbox + Disabled Checkbox
- - - - + + + + Rating
@@ -229,7 +229,7 @@ {{ heartRate | number : '1.1' }}
- - + +
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 34e7092e..da3cb81f 100644 --- a/src/app/pages/forms/form-inputs/form-inputs.component.scss +++ b/src/app/pages/forms/form-inputs/form-inputs.component.scss @@ -1,8 +1,8 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { - nga-card-body { + nb-card-body { overflow: visible; } @@ -46,26 +46,26 @@ .star { font-size: 1.5rem; - color: nga-theme(color-fg); + color: nb-theme(color-fg); } .filled { - color: nga-theme(color-fg); + color: nb-theme(color-fg); } // TODO: Replace with the card header styles mixin .rating-header { line-height: 2rem; font-size: 1.25rem; - font-family: nga-theme(font-secondary); - font-weight: nga-theme(font-weight-bolder); - color: nga-theme(color-fg-heading); + font-family: nb-theme(font-secondary); + font-weight: nb-theme(font-weight-bolder); + color: nb-theme(color-fg-heading); } .current-rate { font-size: 1.5rem; padding-left: 1rem; - color: nga-theme(color-fg-heading); + color: nb-theme(color-fg-heading); } .full-name-inputs { diff --git a/src/app/pages/forms/form-layouts/form-layouts.component.html b/src/app/pages/forms/form-layouts/form-layouts.component.html index 33ff8580..8ebd4147 100644 --- a/src/app/pages/forms/form-layouts/form-layouts.component.html +++ b/src/app/pages/forms/form-layouts/form-layouts.component.html @@ -1,10 +1,10 @@
- - + + Inline form - - + +
@@ -12,19 +12,19 @@
- Remember me + Remember me
- - + +
- - Using the Grid - + + Using the Grid +
@@ -68,7 +68,7 @@
- Check me out + Check me out
@@ -78,13 +78,13 @@
- - - - + + + + Form without labels - - + +
@@ -97,15 +97,15 @@
- - + +
- - + + Basic form - - + +
@@ -116,17 +116,17 @@
- Check me out + Check me out
- - - - + + + + Block form - - + +
@@ -156,17 +156,17 @@
- - + +
- - + + Horizontal form - - + +
@@ -183,7 +183,7 @@
- Remember me + Remember me
@@ -193,7 +193,7 @@
- - + +
diff --git a/src/app/pages/forms/forms.module.ts b/src/app/pages/forms/forms.module.ts index 41b85789..1565f456 100644 --- a/src/app/pages/forms/forms.module.ts +++ b/src/app/pages/forms/forms.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { NgaCheckboxModule } from '@akveo/nga-theme'; +import { NbCheckboxModule } from '@nebular/theme'; import { SharedModule } from '../../shared.module'; @@ -11,7 +11,7 @@ import { FormsRoutingModule, routedComponents } from './forms-routing.module'; SharedModule, FormsRoutingModule, NgbModule, - NgaCheckboxModule, + NbCheckboxModule, ], declarations: [ ...routedComponents, diff --git a/src/app/pages/maps/bubble/bubble-map.component.scss b/src/app/pages/maps/bubble/bubble-map.component.scss index 5a7241e9..f9c64a43 100644 --- a/src/app/pages/maps/bubble/bubble-map.component.scss +++ b/src/app/pages/maps/bubble/bubble-map.component.scss @@ -1,17 +1,17 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { $card-header-border: 1px; - nga-card-body { - padding: nga-theme(card-padding) 0 0 0; + nb-card-body { + padding: nb-theme(card-padding) 0 0 0; } .echarts { width: 100%; - height: calc(#{nga-theme(card-height-xlarge)} - (#{nga-theme(card-padding) * 2}) - - (#{nga-theme(card-header-font-size)} * #{nga-theme(card-line-height)}) - - #{$card-header-border} - #{nga-theme(card-padding)}); + height: calc(#{nb-theme(card-height-xlarge)} - (#{nb-theme(card-padding) * 2}) - + (#{nb-theme(card-header-font-size)} * #{nb-theme(card-line-height)}) - + #{$card-header-border} - #{nb-theme(card-padding)}); } } diff --git a/src/app/pages/maps/bubble/bubble-map.component.ts b/src/app/pages/maps/bubble/bubble-map.component.ts index 65b76812..67c91b9e 100644 --- a/src/app/pages/maps/bubble/bubble-map.component.ts +++ b/src/app/pages/maps/bubble/bubble-map.component.ts @@ -1,16 +1,16 @@ import { Component } from '@angular/core'; -import { NgaThemeService } from '@akveo/nga-theme'; +import { NbThemeService } from '@nebular/theme'; @Component({ selector: 'ngx-bubble-map', styleUrls: ['./bubble-map.component.scss'], template: ` - - Bubble Maps - + + Bubble Maps +
- - + + `, }) export class BubbleMapComponent { @@ -23,7 +23,7 @@ export class BubbleMapComponent { bubbleTheme: any; - constructor(private theme: NgaThemeService) { + constructor(private theme: NbThemeService) { this.theme.getJsTheme() .subscribe(config => { diff --git a/src/app/pages/maps/gmaps/gmaps.component.scss b/src/app/pages/maps/gmaps/gmaps.component.scss index 8826f1cf..512862a5 100644 --- a/src/app/pages/maps/gmaps/gmaps.component.scss +++ b/src/app/pages/maps/gmaps/gmaps.component.scss @@ -1,8 +1,8 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { - nga-card-body { + nb-card-body { padding: 0; } diff --git a/src/app/pages/maps/gmaps/gmaps.component.ts b/src/app/pages/maps/gmaps/gmaps.component.ts index b5b89aec..22e1b4fe 100644 --- a/src/app/pages/maps/gmaps/gmaps.component.ts +++ b/src/app/pages/maps/gmaps/gmaps.component.ts @@ -4,14 +4,14 @@ import { Component } from '@angular/core'; selector: 'ngx-gmaps', styleUrls: ['./gmaps.component.scss'], template: ` - - Google Maps - + + Google Maps + - - + + `, }) export class GmapsComponent { diff --git a/src/app/pages/maps/leaflet/leaflet.component.scss b/src/app/pages/maps/leaflet/leaflet.component.scss index c3b6af75..5bfcd7d0 100644 --- a/src/app/pages/maps/leaflet/leaflet.component.scss +++ b/src/app/pages/maps/leaflet/leaflet.component.scss @@ -1,16 +1,16 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { $card-header-border: 1px; - nga-card-body { + nb-card-body { padding: 0; } /deep/ .leaflet-container { width: 100%; - height: calc(#{nga-theme(card-height-xlarge)} - (#{nga-theme(card-padding) * 2}) - - (#{nga-theme(card-header-font-size)} * #{nga-theme(card-line-height)}) - #{$card-header-border}); + height: calc(#{nb-theme(card-height-xlarge)} - (#{nb-theme(card-padding) * 2}) - + (#{nb-theme(card-header-font-size)} * #{nb-theme(card-line-height)}) - #{$card-header-border}); } } diff --git a/src/app/pages/maps/leaflet/leaflet.component.ts b/src/app/pages/maps/leaflet/leaflet.component.ts index b661b59a..0665b0df 100644 --- a/src/app/pages/maps/leaflet/leaflet.component.ts +++ b/src/app/pages/maps/leaflet/leaflet.component.ts @@ -7,12 +7,12 @@ import 'style-loader!leaflet/dist/leaflet.css'; selector: 'ngx-leaflet', styleUrls: ['./leaflet.component.scss'], template: ` - - Leaflet Maps - + + Leaflet Maps +
- - + + `, }) export class LeafletComponent { diff --git a/src/app/pages/pages-menu.ts b/src/app/pages/pages-menu.ts index 5f6e8468..951addc4 100644 --- a/src/app/pages/pages-menu.ts +++ b/src/app/pages/pages-menu.ts @@ -1,8 +1,8 @@ -import { NgaMenuItem } from '@akveo/nga-theme'; +import { NbMenuItem } from '@nebular/theme'; import { List } from 'immutable'; -export const MENU_ITEMS: List = List([{ +export const MENU_ITEMS: List = List([{ title: 'Dashboard', icon: 'ion ion-ios-home-outline', link: '/pages/dashboard', @@ -14,7 +14,7 @@ export const MENU_ITEMS: List = List([{ title: 'UI Features', icon: 'ion ion-ios-keypad-outline', link: '/pages/ui-features', - children: List([{ + children: List([{ title: 'Buttons', link: '/pages/ui-features/buttons', }, { @@ -39,7 +39,7 @@ export const MENU_ITEMS: List = List([{ }, { title: 'Forms', icon: 'ion-compose', - children: List([{ + children: List([{ title: 'Form Inputs', link: '/pages/forms/inputs', }, { @@ -49,7 +49,7 @@ export const MENU_ITEMS: List = List([{ }, { title: 'Components', icon: 'ion ion-ios-gear-outline', - children: List([{ + children: List([{ title: 'Tree', link: '/pages/components/tree', }, { @@ -59,7 +59,7 @@ export const MENU_ITEMS: List = List([{ }, { title: 'Maps', icon: 'ion ion-ios-location-outline', - children: List([{ + children: List([{ title: 'Google Maps', link: '/pages/maps/gmaps', }, { @@ -72,7 +72,7 @@ export const MENU_ITEMS: List = List([{ }, { title: 'Charts', icon: 'ion ion-arrow-graph-up-right', - children: List([{ + children: List([{ title: 'Echarts', link: '/pages/charts/echarts', }, { @@ -85,7 +85,7 @@ export const MENU_ITEMS: List = List([{ }, { title: 'Editors', icon: 'ion ion-edit', - children: List([{ + children: List([{ title: 'TinyMCE', link: '/pages/editors/tinymce', }, { @@ -95,7 +95,7 @@ export const MENU_ITEMS: List = List([{ }, { title: 'Tables', icon: 'ion-ios-grid-view', - children: List([{ + children: List([{ title: 'Smart Table', link: '/pages/tables/smart-table', }]), diff --git a/src/app/pages/pages.component.ts b/src/app/pages/pages.component.ts index c0bf2812..d304406f 100644 --- a/src/app/pages/pages.component.ts +++ b/src/app/pages/pages.component.ts @@ -7,7 +7,7 @@ import { MENU_ITEMS } from './pages-menu'; selector: 'ngx-pages', template: ` - + `, diff --git a/src/app/pages/tables/smart-table/smart-table.component.html b/src/app/pages/tables/smart-table/smart-table.component.html index 65ee1ce7..05cd834c 100644 --- a/src/app/pages/tables/smart-table/smart-table.component.html +++ b/src/app/pages/tables/smart-table/smart-table.component.html @@ -1,10 +1,10 @@ - - + + Smart Table - + - + - - + + diff --git a/src/app/pages/ui-features/buttons/action-groups/action-groups.component.html b/src/app/pages/ui-features/buttons/action-groups/action-groups.component.html index b6daa129..a1e2caa0 100644 --- a/src/app/pages/ui-features/buttons/action-groups/action-groups.component.html +++ b/src/app/pages/ui-features/buttons/action-groups/action-groups.component.html @@ -2,16 +2,16 @@
Action Groups
- - - - - - - - - - - - + + + + + + + + + + + + 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 8d5ca986..72a217f9 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/variables'; -@import '~@akveo/nga-theme/components/card/card.component.theme'; +@import '~@nebular/theme/components/card/card.component.theme'; -@include nga-install-component() { +@include nb-install-component() { .action-groups { display: flex; } @@ -9,6 +9,6 @@ .action-groups-header { flex: 1; - @include nga-card-header(); + @include nb-card-header(); } } diff --git a/src/app/pages/ui-features/buttons/block-level-buttons/block-level-buttons.component.html b/src/app/pages/ui-features/buttons/block-level-buttons/block-level-buttons.component.html index a11d3e9d..4e421d0b 100644 --- a/src/app/pages/ui-features/buttons/block-level-buttons/block-level-buttons.component.html +++ b/src/app/pages/ui-features/buttons/block-level-buttons/block-level-buttons.component.html @@ -1,6 +1,6 @@ - - Block Level Buttons - + + Block Level Buttons +
@@ -12,5 +12,5 @@
- - + + diff --git a/src/app/pages/ui-features/buttons/button-groups/button-groups.component.html b/src/app/pages/ui-features/buttons/button-groups/button-groups.component.html index 07cd9221..626ac2db 100644 --- a/src/app/pages/ui-features/buttons/button-groups/button-groups.component.html +++ b/src/app/pages/ui-features/buttons/button-groups/button-groups.component.html @@ -1,6 +1,6 @@ - - Button Groups - + + Button Groups +
@@ -120,5 +120,5 @@
- - + + 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 8669c0de..2afa274f 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/variables'; -@include nga-install-component() { +@include nb-install-component() { .toolbars-container { display: flex; diff --git a/src/app/pages/ui-features/buttons/buttons.component.html b/src/app/pages/ui-features/buttons/buttons.component.html index bf1b48ba..e9fa8152 100644 --- a/src/app/pages/ui-features/buttons/buttons.component.html +++ b/src/app/pages/ui-features/buttons/buttons.component.html @@ -4,14 +4,14 @@
- + - - - + + + - - + +
diff --git a/src/app/pages/ui-features/buttons/buttons.component.scss b/src/app/pages/ui-features/buttons/buttons.component.scss index 527a8e52..d3ec759c 100644 --- a/src/app/pages/ui-features/buttons/buttons.component.scss +++ b/src/app/pages/ui-features/buttons/buttons.component.scss @@ -1,19 +1,19 @@ @import '../../../@theme/styles/variables'; -@import '~@akveo/nga-theme/styles/global/bootstrap/buttons'; +@import '~@nebular/theme/styles/global/bootstrap/buttons'; -@include nga-install-component() { +@include nb-install-component() { /deep/ { $button-size: 50px; $button-border-radius: 12px; .container-title { - color: nga-theme(color-fg); - font-family: nga-theme(font-secondary); + color: nb-theme(color-fg); + font-family: nb-theme(font-secondary); margin-bottom: 0.5rem; } .header { - color: nga-theme(color-fg-header); + color: nb-theme(color-fg-header); font-size: 0.875rem; line-height: 1rem; } @@ -22,7 +22,7 @@ font-size: 0.75rem; line-height: 1rem; font-weight: 300; - color: nga-theme(color-fg); + color: nb-theme(color-fg); } .btn-demo { diff --git a/src/app/pages/ui-features/buttons/buttons.module.ts b/src/app/pages/ui-features/buttons/buttons.module.ts index b169597e..f2ce5587 100644 --- a/src/app/pages/ui-features/buttons/buttons.module.ts +++ b/src/app/pages/ui-features/buttons/buttons.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { NgaActionsModule, NgaSearchModule, NgaUserModule } from '@akveo/nga-theme'; +import { NbActionsModule, NbSearchModule, NbUserModule } from '@nebular/theme'; import { SharedModule } from '../../../shared.module'; @@ -32,9 +32,9 @@ const components = [ @NgModule({ imports: [ SharedModule, - NgaActionsModule, - NgaSearchModule, - NgaUserModule, + NbActionsModule, + NbSearchModule, + NbUserModule, ], exports: [ ...components, diff --git a/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.html b/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.html index 88ea616b..34c032e4 100644 --- a/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.html +++ b/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.html @@ -1,5 +1,5 @@ - - + + Default Buttons
- - + +
@@ -77,5 +77,5 @@
- - + + 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 70ee70a6..8c667d83 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,9 +1,9 @@ @import '../../../../@theme/styles/variables'; -@import '~@akveo/nga-theme/styles/global/bootstrap/buttons'; +@import '~@nebular/theme/styles/global/bootstrap/buttons'; -@include nga-install-component() { +@include nb-install-component() { - nga-card-header { + nb-card-header { display: flex; span { @@ -21,7 +21,7 @@ .primary-container { .original { - background-color: nga-theme(btn-primary-bg); + background-color: nb-theme(btn-primary-bg); } .hover { @include btn-primary-hover(); @@ -33,12 +33,12 @@ .primary-container.outline .original { background-color: transparent; - border: 2px solid nga-theme(btn-primary-bg); + border: 2px solid nb-theme(btn-primary-bg); } .success-container { .original { - background-color: nga-theme(btn-success-bg); + background-color: nb-theme(btn-success-bg); } .hover { @include btn-success-hover(); @@ -50,12 +50,12 @@ .success-container.outline .original { background-color: transparent; - border: 2px solid nga-theme(btn-success-bg); + border: 2px solid nb-theme(btn-success-bg); } .warning-container { .original { - background-color: nga-theme(btn-warning-bg); + background-color: nb-theme(btn-warning-bg); } .hover { @include btn-warning-hover(); @@ -67,12 +67,12 @@ .warning-container.outline .original { background-color: transparent; - border: 2px solid nga-theme(btn-warning-bg); + border: 2px solid nb-theme(btn-warning-bg); } .info-container { .original { - background-color: nga-theme(btn-info-bg); + background-color: nb-theme(btn-info-bg); } .hover { @include btn-info-hover(); @@ -84,12 +84,12 @@ .info-container.outline .original { background-color: transparent; - border: 2px solid nga-theme(btn-info-bg); + border: 2px solid nb-theme(btn-info-bg); } .danger-container { .original { - background-color: nga-theme(btn-danger-bg); + background-color: nb-theme(btn-danger-bg); } .hover { @include btn-danger-hover(); @@ -101,12 +101,12 @@ .danger-container.outline .original { background-color: transparent; - border: 2px solid nga-theme(btn-danger-bg); + border: 2px solid nb-theme(btn-danger-bg); } .secondary-container { .original { - border: 2px solid nga-theme(btn-secondary-border); + border: 2px solid nb-theme(btn-secondary-border); } .hover { @include btn-secondary-hover(); @@ -118,6 +118,6 @@ .secondary-container.outline .original { background-color: transparent; - border: 2px solid nga-theme(btn-secondary-border); + border: 2px solid nb-theme(btn-secondary-border); } } diff --git a/src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.html b/src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.html index ff65a995..5148a5ea 100644 --- a/src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.html +++ b/src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.html @@ -1,6 +1,6 @@ - - Button Dropdowns - + + Button Dropdowns +
@@ -40,5 +40,5 @@
  • Default
    • -     -     + + 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 e69785ce..bdbff272 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,13 +1,13 @@ @import '../../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { text-align: center; .dropdown, .btn-group { margin-bottom: 1rem; } - nga-card-body { + nb-card-body { overflow: visible; } } diff --git a/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.html b/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.html index 38c395fb..0c3525d7 100644 --- a/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.html +++ b/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.html @@ -1,6 +1,6 @@ - - Hero Buttons - + + Hero Buttons +
    @@ -51,5 +51,5 @@
    -     -     + + 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 ac7788ee..2fb7dcb0 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,7 +1,7 @@ @import '../../../../@theme/styles/variables'; -@import '~@akveo/nga-theme/styles/global/bootstrap/buttons'; +@import '~@nebular/theme/styles/global/bootstrap/buttons'; -@include nga-install-component() { +@include nb-install-component() { .primary-container { .gradient { @@ -80,8 +80,8 @@ .secondary-container { .border { - color: nga-theme(btn-secondary-color); - border: nga-theme(btn-secondary-border-width) solid nga-theme(btn-secondary-border); + color: nb-theme(btn-secondary-color); + border: nb-theme(btn-secondary-border-width) solid nb-theme(btn-secondary-border); } .glow { box-shadow: btn-hero-secondary-glow(); diff --git a/src/app/pages/ui-features/buttons/icon-buttons/icon-buttons.component.html b/src/app/pages/ui-features/buttons/icon-buttons/icon-buttons.component.html index 512951dc..94f40af1 100644 --- a/src/app/pages/ui-features/buttons/icon-buttons/icon-buttons.component.html +++ b/src/app/pages/ui-features/buttons/icon-buttons/icon-buttons.component.html @@ -1,6 +1,6 @@ - - Icon buttons - + + Icon buttons +
    @@ -39,5 +39,5 @@
    -     -     + + diff --git a/src/app/pages/ui-features/buttons/icon-buttons/icon-buttons.component.scss b/src/app/pages/ui-features/buttons/icon-buttons/icon-buttons.component.scss index ae4bf278..c3767626 100644 --- a/src/app/pages/ui-features/buttons/icon-buttons/icon-buttons.component.scss +++ b/src/app/pages/ui-features/buttons/icon-buttons/icon-buttons.component.scss @@ -1,4 +1,4 @@ -nga-card-body { +nb-card-body { div:not(:last-child) { margin-bottom: 1rem; } diff --git a/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.html b/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.html index 2a7d0103..825eef2f 100644 --- a/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.html +++ b/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.html @@ -1,14 +1,14 @@ - - + + Pause - - + + Log View - - + + Search - - + + Setup - - + + 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 e7d56211..446d3344 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,17 +1,17 @@ @import '../../../../@theme/styles/variables'; -@include nga-install-component() { - nga-action { +@include nb-install-component() { + nb-action { i { - color: nga-theme(color-fg); + color: nb-theme(color-fg); font-size: 2.5rem; margin-right: 1rem; } span { - font-family: nga-theme(font-family-secondary); - font-weight: nga-theme(font-weight-bold); - color: nga-theme(color-fg-heading); + font-family: nb-theme(font-family-secondary); + font-weight: nb-theme(font-weight-bold); + color: nb-theme(color-fg-heading); text-transform: uppercase; } } diff --git a/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.html b/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.html index 08d8d100..efc88c98 100644 --- a/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.html +++ b/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.html @@ -1,6 +1,6 @@ - - Button Shapes - + + Button Shapes +
    @@ -39,5 +39,5 @@
    -     -     + + 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 dc556ef6..96f779c7 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,13 +1,13 @@ @import '../../../../@theme/styles/variables'; -@import '~@akveo/nga-theme/styles/global/bootstrap/buttons'; +@import '~@nebular/theme/styles/global/bootstrap/buttons'; -@include nga-install-component() { +@include nb-install-component() { .subheader { margin-bottom: 19px; span:nth-child(2) { - color: nga-theme(color-fg-heading); + color: nb-theme(color-fg-heading); } } } diff --git a/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.html b/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.html index 2fd39d97..79e3cc1a 100644 --- a/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.html +++ b/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.html @@ -1,7 +1,7 @@ - - Button Sizes + + Button Sizes - +
    Large Button @@ -46,5 +46,5 @@
    -     -     + + 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 b60c0e77..1b3f3555 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,7 +1,7 @@ @import '../../../../@theme/styles/variables'; -@import '~@akveo/nga-theme/styles/global/bootstrap/buttons'; +@import '~@nebular/theme/styles/global/bootstrap/buttons'; -@include nga-install-component() { +@include nb-install-component() { .size-container { display: inline-block; @@ -10,6 +10,6 @@ .subheader { margin-bottom: 1rem; - color: nga-theme(color-fg-heading); + color: nb-theme(color-fg-heading); } } diff --git a/src/app/pages/ui-features/grid/grid.component.html b/src/app/pages/ui-features/grid/grid.component.html index a2130f8f..e2e3b85a 100644 --- a/src/app/pages/ui-features/grid/grid.component.html +++ b/src/app/pages/ui-features/grid/grid.component.html @@ -1,10 +1,10 @@
    - - + + Grid System - - + +
    Stacked to horizontal
    @@ -245,7 +245,7 @@
    - - + +
    diff --git a/src/app/pages/ui-features/icons/icons.component.html b/src/app/pages/ui-features/icons/icons.component.html index 9a1b98c5..0c9a93d8 100644 --- a/src/app/pages/ui-features/icons/icons.component.html +++ b/src/app/pages/ui-features/icons/icons.component.html @@ -1,31 +1,31 @@
    - - + + Ionicons - - + +
    -     - + + See all ionicons icons - -     + +
    - - + + Font awesome icons - - + +
    -     - + + See all Font Awesome icons - -     + +
    diff --git a/src/app/pages/ui-features/icons/icons.component.scss b/src/app/pages/ui-features/icons/icons.component.scss index 43bdd81e..82b41705 100644 --- a/src/app/pages/ui-features/icons/icons.component.scss +++ b/src/app/pages/ui-features/icons/icons.component.scss @@ -7,11 +7,11 @@ } :host { - nga-card-body { + nb-card-body { padding: 0; } - nga-card-footer { + nb-card-footer { text-align: right; } } diff --git a/src/app/pages/ui-features/modals/modals.component.html b/src/app/pages/ui-features/modals/modals.component.html index 8ef2049a..c33caefb 100644 --- a/src/app/pages/ui-features/modals/modals.component.html +++ b/src/app/pages/ui-features/modals/modals.component.html @@ -1,12 +1,12 @@
    - - Modals - + + Modals + - - + +
    diff --git a/src/app/pages/ui-features/modals/modals.component.ts b/src/app/pages/ui-features/modals/modals.component.ts index f7bce542..07bc9fe7 100644 --- a/src/app/pages/ui-features/modals/modals.component.ts +++ b/src/app/pages/ui-features/modals/modals.component.ts @@ -13,12 +13,12 @@ export class ModalsComponent { constructor(private modalService: NgbModal) { } showLargeModal() { - const activeModal = this.modalService.open(ModalComponent, { size: 'lg', container: 'nga-layout' }); + const activeModal = this.modalService.open(ModalComponent, { size: 'lg', container: 'nb-layout' }); activeModal.componentInstance.modalHeader = 'Large Modal'; } showSmallModal() { - const activeModal = this.modalService.open(ModalComponent, { size: 'sm', container: 'nga-layout' }); + const activeModal = this.modalService.open(ModalComponent, { size: 'sm', container: 'nb-layout' }); activeModal.componentInstance.modalHeader = 'Small Modal'; } @@ -27,7 +27,7 @@ export class ModalsComponent { const activeModal = this.modalService.open(ModalComponent, { size: 'sm', backdrop: 'static', - container: 'nga-layout', + container: 'nb-layout', }); activeModal.componentInstance.modalHeader = 'Static modal'; diff --git a/src/app/pages/ui-features/search-fields/search-fields.component.html b/src/app/pages/ui-features/search-fields/search-fields.component.html index db573516..4c77d589 100644 --- a/src/app/pages/ui-features/search-fields/search-fields.component.html +++ b/src/app/pages/ui-features/search-fields/search-fields.component.html @@ -1,85 +1,85 @@
    - - + + Simple search - - - - - + + + + +
    - - + + Layout Rotate Search - - - - - + + + + +
    - - + + Modal Zoomin Search - - - - - + + + + +
    - - + + Modal Move Search - - - - - + + + + +
    - - + + Modal Drop Search - - - - - + + + + +
    - - + + Modal Half Search - - - - - + + + + +
    - - + + Curtain Search - - - - - + + + + +
    - - + + Column Curtain Search - - - - - + + + + +
    diff --git a/src/app/pages/ui-features/tabs/tabs.component.html b/src/app/pages/ui-features/tabs/tabs.component.html index 17b15c09..3e45e21e 100644 --- a/src/app/pages/ui-features/tabs/tabs.component.html +++ b/src/app/pages/ui-features/tabs/tabs.component.html @@ -1,40 +1,40 @@
    - - - + + +

    In 1975, the first general purpose home automation network technology, X10, was developed. It is a communication protocol for electronic devices. It primarily uses electric power transmission wiring for signalling and control, where the signals involve brief radio frequency bursts of digital data, and remains the most widely available.[8] By 1978, X10 products included a 16 channel command console, a lamp module, and an appliance module. Soon after came the wall switch module and the first X10 timer.

    -     - + + Content #2 - - + + Content #3 - -     -     + + +
    - - - + + +

    Home automation or smart home[1] (also known as domotics[2]) is building automation for the home. It involves the control and automation of lighting, heating (such as smart thermostats), ventilation, air conditioning (HVAC), and security, as well as home appliances such as washer/dryers, ovens or refrigerators/freezers. Wi-Fi is often used for remote monitoring and control. Home devices, when remotely monitored and controlled via the Internet, are an important constituent of the Internet of Things. Modern systems generally consist of switches and sensors connected to a central hub sometimes called a "gateway" from which the system is controlled with a user interface that is interacted either with a wall-mounted terminal, mobile phone software, tablet computer or a web interface, often but not always via Internet cloud services.

    While there are many competing vendors, there are very few worldwide accepted industry standards and the smart home space is heavily fragmented.[3] Popular communications protocol for products include X10, Ethernet, RS-485, 6LoWPAN, Bluetooth LE (BLE), ZigBee and Z-Wave, or other proprietary protocols all of which are incompatible with each other.[4] Manufacturers often prevent independent implementations by withholding documentation and by litigation.[5]

    -     - + + Content #2 - - + + Content #3 - -     -     + + +
    - - - + + +
    diff --git a/src/app/pages/ui-features/tabs/tabs.component.scss b/src/app/pages/ui-features/tabs/tabs.component.scss index db0d8332..30cda6f2 100644 --- a/src/app/pages/ui-features/tabs/tabs.component.scss +++ b/src/app/pages/ui-features/tabs/tabs.component.scss @@ -1,18 +1,18 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { - nga-tabset { +@include nb-install-component() { + nb-tabset { height: 100%; display: flex; flex-direction: column; } - nga-tab { - padding: nga-theme(padding); + nb-tab { + padding: nb-theme(padding); } /deep/ ngx-tab1, /deep/ ngx-tab2 { display: block; - padding: nga-theme(padding); + padding: nb-theme(padding); } } diff --git a/src/app/pages/ui-features/typography/typography.component.html b/src/app/pages/ui-features/typography/typography.component.html index 7cf5b2b5..f08f75ee 100644 --- a/src/app/pages/ui-features/typography/typography.component.html +++ b/src/app/pages/ui-features/typography/typography.component.html @@ -2,11 +2,11 @@
    - - + + Used Fonts - - + +
    Exo
    @@ -40,15 +40,15 @@ Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean.

    - - + +
    - - + + Headings - - + +

    H1. Heading

    @@ -103,16 +103,16 @@ Demibold 1rem (16px)
    -     -     + +
    - - + + Article Example - - + +

    So what's About the grammar?

    Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, @@ -129,15 +129,15 @@ Lorem Ipsum decided to leave for the far World of Grammar.

    -     -     + +
    - - + + Blockquotes - - + +

    Far far away, behind the word mountains, far from the countries Vokalia and Consonantia.

    @@ -149,17 +149,17 @@

    Far far away, behind the word mountains.

    Vladimir Lugovsky
    -     -     + +
    - - + + Font Colors - - + +
    @@ -218,8 +218,8 @@
    - - + +
    @@ -228,11 +228,11 @@
    - - + + Alerts - - + + @@ -251,15 +251,15 @@ - - + +
    - - + + Text Types - - + +

    Highlighted text

    Far far away, behind the word mountains, far from the countries @@ -275,17 +275,17 @@ Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.

    -     -     + +
    - - + + Lists - - + +

    Ordered List

    1. Far far away, behind the word mountains
      2. @@ -303,7 +303,7 @@
    2. Right at the coast of the Semantics.
    3. A small river named Duden flows
      4. - - + +
    diff --git a/src/app/pages/ui-features/typography/typography.component.scss b/src/app/pages/ui-features/typography/typography.component.scss index 03a77c8f..3ad23b03 100644 --- a/src/app/pages/ui-features/typography/typography.component.scss +++ b/src/app/pages/ui-features/typography/typography.component.scss @@ -1,16 +1,16 @@ @import '../../../@theme/styles/variables'; -@include nga-install-component() { +@include nb-install-component() { .font-secondary .font-header .name { font-size: 4.5rem; line-height: 4rem; - font-weight: nga-theme(font-weight-bold); + font-weight: nb-theme(font-weight-bold); } .font-main .font-header .name { font-size: 3rem; - font-weight: nga-theme(font-weight-bold); + font-weight: nb-theme(font-weight-bold); } .font-row { @@ -32,8 +32,8 @@ align-items: center; padding-bottom: 1rem; margin-bottom: 1rem; - border-bottom: 1px solid nga-theme(separator); - color: nga-theme(color-fg-heading); + border-bottom: 1px solid nb-theme(separator); + color: nb-theme(color-fg-heading); &:last-child { border-bottom: none; @@ -68,7 +68,7 @@ display: flex; justify-content: flex-end; align-items: flex-end; - color: nga-theme(color-fg); + color: nb-theme(color-fg); } } diff --git a/src/app/pages/ui-features/ui-features.module.ts b/src/app/pages/ui-features/ui-features.module.ts index 722abf46..d125941c 100644 --- a/src/app/pages/ui-features/ui-features.module.ts +++ b/src/app/pages/ui-features/ui-features.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { NgaTabsetModule, NgaRouteTabsetModule, NgaSearchModule } from '@akveo/nga-theme'; +import { NbTabsetModule, NbRouteTabsetModule, NbSearchModule } from '@nebular/theme'; import { SharedModule } from '../../shared.module'; @@ -32,9 +32,9 @@ const components = [ imports: [ SharedModule, UiFeaturesRoutingModule, - NgaTabsetModule, - NgaRouteTabsetModule, - NgaSearchModule, + NbTabsetModule, + NbRouteTabsetModule, + NbSearchModule, ButtonsModule, ], declarations: [ diff --git a/src/app/shared.module.ts b/src/app/shared.module.ts index 63052e46..512ca2a3 100644 --- a/src/app/shared.module.ts +++ b/src/app/shared.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -import { NgaCardModule, NgaThemeModule } from '@akveo/nga-theme'; +import { NbCardModule, NbThemeModule } from '@nebular/theme'; import { ThemeModule } from './@theme/theme.module'; @NgModule({ @@ -11,8 +11,8 @@ import { ThemeModule } from './@theme/theme.module'; FormsModule, ReactiveFormsModule, RouterModule, - NgaCardModule, - NgaThemeModule, + NbCardModule, + NbThemeModule, ThemeModule, ], }) diff --git a/src/index.html b/src/index.html index 00abe18d..8759e907 100644 --- a/src/index.html +++ b/src/index.html @@ -11,7 +11,7 @@ Loading... -