diff --git a/docs/app/@theme/components/docs-footer/footer.component.scss b/docs/app/@theme/components/docs-footer/footer.component.scss index e95fde9b..b06f5892 100644 --- a/docs/app/@theme/components/docs-footer/footer.component.scss +++ b/docs/app/@theme/components/docs-footer/footer.component.scss @@ -5,7 +5,7 @@ */ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { diff --git a/docs/app/@theme/components/footer/footer.component.scss b/docs/app/@theme/components/footer/footer.component.scss index 6f61ce3f..a5fd1f5e 100644 --- a/docs/app/@theme/components/footer/footer.component.scss +++ b/docs/app/@theme/components/footer/footer.component.scss @@ -5,7 +5,7 @@ */ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { $text-fg: nb-theme(footer-text-color); diff --git a/docs/app/@theme/components/header/header.component.scss b/docs/app/@theme/components/header/header.component.scss index 58d44694..a247adc2 100644 --- a/docs/app/@theme/components/header/header.component.scss +++ b/docs/app/@theme/components/header/header.component.scss @@ -5,7 +5,7 @@ */ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { diff --git a/docs/app/@theme/components/section-title/section-title.component.scss b/docs/app/@theme/components/section-title/section-title.component.scss index 6a1bde58..bd52ed8f 100644 --- a/docs/app/@theme/components/section-title/section-title.component.scss +++ b/docs/app/@theme/components/section-title/section-title.component.scss @@ -5,7 +5,7 @@ */ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { h2 { diff --git a/docs/app/@theme/styles/styles.scss b/docs/app/@theme/styles/styles.scss index 35f5b850..64e4e9d3 100644 --- a/docs/app/@theme/styles/styles.scss +++ b/docs/app/@theme/styles/styles.scss @@ -7,13 +7,11 @@ @import 'helvetica-neue'; @import 'themes'; -@import '~@nebular/theme/styles/globals'; -@import '~@nebular/bootstrap/styles/globals'; +@import '@nebular/theme/styles/globals'; @import 'hs-forms'; @include nb-install() { @include nb-theme-global(); - @include nb-bootstrap-global(); @include hs-custom-form(); }; diff --git a/docs/app/@theme/styles/themes.scss b/docs/app/@theme/styles/themes.scss index 5029fa46..6b490b02 100644 --- a/docs/app/@theme/styles/themes.scss +++ b/docs/app/@theme/styles/themes.scss @@ -4,10 +4,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. */ -@import '~@nebular/theme/styles/theming'; -@import '~@nebular/theme/styles/themes/corporate'; -@import '~@nebular/theme/styles/themes/default'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/theming'; +@import '@nebular/theme/styles/themes/corporate'; +@import '@nebular/theme/styles/themes/default'; +@import '@nebular/theme/styles/global/breakpoints'; /* We have to overwrite breakpoints because we need to add *macpro* breakpoint. diff --git a/docs/app/blocks/components/components-overview-block/components-overview-block.component.scss b/docs/app/blocks/components/components-overview-block/components-overview-block.component.scss index dff79246..c9743eb5 100644 --- a/docs/app/blocks/components/components-overview-block/components-overview-block.component.scss +++ b/docs/app/blocks/components/components-overview-block/components-overview-block.component.scss @@ -1,5 +1,5 @@ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { diff --git a/docs/app/blocks/components/pager-block/pager-block.component.scss b/docs/app/blocks/components/pager-block/pager-block.component.scss index f3c89fd7..8dba8337 100644 --- a/docs/app/blocks/components/pager-block/pager-block.component.scss +++ b/docs/app/blocks/components/pager-block/pager-block.component.scss @@ -5,7 +5,7 @@ */ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { diff --git a/docs/app/blocks/components/tabbed-example-block/tabbed-example-block.component.scss b/docs/app/blocks/components/tabbed-example-block/tabbed-example-block.component.scss index a2df04f8..45bd95c6 100644 --- a/docs/app/blocks/components/tabbed-example-block/tabbed-example-block.component.scss +++ b/docs/app/blocks/components/tabbed-example-block/tabbed-example-block.component.scss @@ -1,5 +1,5 @@ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { diff --git a/docs/app/pages/home/backend-bundles-section/backend-bundles-section.component.scss b/docs/app/pages/home/backend-bundles-section/backend-bundles-section.component.scss index 6cf32b9b..2a36b62c 100644 --- a/docs/app/pages/home/backend-bundles-section/backend-bundles-section.component.scss +++ b/docs/app/pages/home/backend-bundles-section/backend-bundles-section.component.scss @@ -5,7 +5,7 @@ */ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { $content-width: nb-theme(content-width); diff --git a/docs/app/pages/home/contact-form/contact.component.scss b/docs/app/pages/home/contact-form/contact.component.scss index 0b1741cf..c370a503 100644 --- a/docs/app/pages/home/contact-form/contact.component.scss +++ b/docs/app/pages/home/contact-form/contact.component.scss @@ -1,5 +1,5 @@ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { $color-active: nb-theme(color-active-fg); diff --git a/docs/app/pages/home/contact-section/contact-section.component.scss b/docs/app/pages/home/contact-section/contact-section.component.scss index 28612539..918be2e7 100644 --- a/docs/app/pages/home/contact-section/contact-section.component.scss +++ b/docs/app/pages/home/contact-section/contact-section.component.scss @@ -5,7 +5,7 @@ */ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { display: block; diff --git a/docs/app/pages/home/description-section/description-section.component.scss b/docs/app/pages/home/description-section/description-section.component.scss index 86929368..62173f85 100644 --- a/docs/app/pages/home/description-section/description-section.component.scss +++ b/docs/app/pages/home/description-section/description-section.component.scss @@ -5,7 +5,7 @@ */ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { $content-width: nb-theme(content-width); diff --git a/docs/app/pages/home/landing-home.component.scss b/docs/app/pages/home/landing-home.component.scss index 9ecdf0c5..9d1ec117 100644 --- a/docs/app/pages/home/landing-home.component.scss +++ b/docs/app/pages/home/landing-home.component.scss @@ -5,7 +5,7 @@ */ @import '../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { $content-width: nb-theme(content-width); diff --git a/docs/app/pages/home/main-info-section/main-info-section.component.scss b/docs/app/pages/home/main-info-section/main-info-section.component.scss index 8c0798cb..4559c909 100644 --- a/docs/app/pages/home/main-info-section/main-info-section.component.scss +++ b/docs/app/pages/home/main-info-section/main-info-section.component.scss @@ -5,7 +5,7 @@ */ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { $color-active: nb-theme(color-active-fg); diff --git a/docs/app/pages/home/material-features/material-features.component.scss b/docs/app/pages/home/material-features/material-features.component.scss index 46c5339e..93e2953a 100644 --- a/docs/app/pages/home/material-features/material-features.component.scss +++ b/docs/app/pages/home/material-features/material-features.component.scss @@ -1,5 +1,5 @@ @import "../../../@theme/styles/themes"; -@import "~@nebular/theme/styles/global/breakpoints"; +@import "@nebular/theme/styles/global/breakpoints"; @include nb-install-component() { $features-section-offset: 10.625rem; diff --git a/docs/app/pages/home/our-projects-section/our-projects-section.component.scss b/docs/app/pages/home/our-projects-section/our-projects-section.component.scss index f965452f..3d2c83e2 100644 --- a/docs/app/pages/home/our-projects-section/our-projects-section.component.scss +++ b/docs/app/pages/home/our-projects-section/our-projects-section.component.scss @@ -5,7 +5,7 @@ */ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { $our-projects-section-offset: 7.125rem; @@ -64,14 +64,14 @@ color: #000000; font-size: 3rem; } - + .description { font-family: nb-theme(font-secondary), sans-serif; font-size: nb-theme(font-size-lg); margin-top: 1.125rem; line-height: 1.5; } - + .btn { font-family: nb-theme(font-main), sans-serif; background-color: nb-theme(color-active-bg); diff --git a/docs/app/pages/home/reason-section/reason-section.component.scss b/docs/app/pages/home/reason-section/reason-section.component.scss index ddd2b422..660c6e80 100644 --- a/docs/app/pages/home/reason-section/reason-section.component.scss +++ b/docs/app/pages/home/reason-section/reason-section.component.scss @@ -5,7 +5,7 @@ */ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { $reasons-section-offset: 10.625rem; @@ -63,7 +63,7 @@ .highlight { font-family: nb-theme(font-main), sans-serif; } - + .active { text-decoration: none; font-family: nb-theme(font-main), sans-serif; diff --git a/docs/app/pages/home/reviews-section/reviews-section.component.scss b/docs/app/pages/home/reviews-section/reviews-section.component.scss index 13074a0e..8b8a8c6d 100644 --- a/docs/app/pages/home/reviews-section/reviews-section.component.scss +++ b/docs/app/pages/home/reviews-section/reviews-section.component.scss @@ -6,7 +6,7 @@ @import '../../../@theme/styles/themes'; @import '../../../@theme/styles/swiper_ngx-admin'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { display: block; diff --git a/docs/app/pages/home/sections-container/ngx-landing-sections-container.component.scss b/docs/app/pages/home/sections-container/ngx-landing-sections-container.component.scss index 5826210d..f3335a8a 100644 --- a/docs/app/pages/home/sections-container/ngx-landing-sections-container.component.scss +++ b/docs/app/pages/home/sections-container/ngx-landing-sections-container.component.scss @@ -5,7 +5,7 @@ */ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { $content-width: nb-theme(content-width); diff --git a/docs/app/pages/home/social-section/social-section.component.scss b/docs/app/pages/home/social-section/social-section.component.scss index 8397f38a..11297190 100644 --- a/docs/app/pages/home/social-section/social-section.component.scss +++ b/docs/app/pages/home/social-section/social-section.component.scss @@ -5,7 +5,7 @@ */ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { display: block; diff --git a/docs/app/pages/home/theme-section/theme-section.component.scss b/docs/app/pages/home/theme-section/theme-section.component.scss index bab36fbc..81f23859 100644 --- a/docs/app/pages/home/theme-section/theme-section.component.scss +++ b/docs/app/pages/home/theme-section/theme-section.component.scss @@ -6,7 +6,7 @@ @import '../../../@theme/styles/themes'; @import '../../../@theme/styles/swiper_ngx-admin'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { diff --git a/docs/app/shared/components/download-form/download-form.component.scss b/docs/app/shared/components/download-form/download-form.component.scss index 7eac4976..9d19ced2 100644 --- a/docs/app/shared/components/download-form/download-form.component.scss +++ b/docs/app/shared/components/download-form/download-form.component.scss @@ -4,7 +4,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. */ -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @import '../../../@theme/styles/themes'; diff --git a/docs/app/shared/components/material-theme-link/material-theme-link.component.scss b/docs/app/shared/components/material-theme-link/material-theme-link.component.scss index 6f101d09..0dc9f27d 100644 --- a/docs/app/shared/components/material-theme-link/material-theme-link.component.scss +++ b/docs/app/shared/components/material-theme-link/material-theme-link.component.scss @@ -1,6 +1,6 @@ @import '../../../@theme/styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @include nb-install-component() { $menu-item-fg: nb-theme(color-fg-heading-light); diff --git a/docs/app/shared/components/premium-form/premium-form.component.scss b/docs/app/shared/components/premium-form/premium-form.component.scss index a1a8c31c..4b980736 100644 --- a/docs/app/shared/components/premium-form/premium-form.component.scss +++ b/docs/app/shared/components/premium-form/premium-form.component.scss @@ -4,7 +4,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. */ -@import '~@nebular/theme/styles/global/breakpoints'; +@import '@nebular/theme/styles/global/breakpoints'; @import '../../../@theme/styles/themes'; diff --git a/package.json b/package.json index f49d7e6b..32403ee6 100644 --- a/package.json +++ b/package.json @@ -112,8 +112,10 @@ "@typescript-eslint/parser": "^5.43.0", "codelyzer": "^6.0.2", "angular-cli-ghpages": "^0.6.2", + "codelyzer": "^6.0.2", "conventional-changelog-cli": "1.3.4", "doc-prsr": "2.2.0", + "eslint": "^8.23.0", "gulp": "4.0.2", "gulp-rename": "1.4.0", "gulp-replace": "1.0.0", @@ -132,6 +134,7 @@ "karma-jasmine-html-reporter": "^1.7.0", "npm-run-all": "4.0.2", "protractor": "~7.0.0", + "raw-loader": "^4.0.2", "rimraf": "2.6.1", "style-loader": "^1.1.3", "stylelint": "7.13.0",