From: Tiago Melo Date: Thu, 7 Nov 2019 15:10:17 +0000 (-0100) Subject: mgr/dashboard: Fix SCSS imports X-Git-Tag: v16.1.0~2351^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e69c1bfddb11031d2917535a7a99accd3c1e19e;p=ceph.git mgr/dashboard: Fix SCSS imports Signed-off-by: Tiago Melo --- diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.scss index 81457a147089..f872325f01f1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.scss @@ -1,4 +1,4 @@ -@import '../../../../styles/chart-tooltip.scss'; +@import 'chart-tooltip.scss'; .chart-container { position: relative; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.scss index e2d23cd4f040..0bb814956b95 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.scss @@ -1,4 +1,4 @@ -@import '../../../../styles/chart-tooltip.scss'; +@import 'chart-tooltip.scss'; $canvas-width: 100%; $canvas-height: 100%; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card-popover.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card-popover.scss index dcfc4a40058a..bfc2766d8ad0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card-popover.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card-popover.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; .info-card-popover-cluster-status { max-width: 23vw; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.scss index d7b40d6f1ad6..252903bee975 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; ::ng-deep .pg-clean { color: $color-bright-green; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.scss index 0feabe594085..2eb33c321b08 100755 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; ::ng-deep cd-login-password-form { h4 { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.scss index 7535c8c84ff6..566564023b5e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; ::ng-deep cd-login { h1 { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.scss index 96a29d72339b..94aff2a0c30b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; thead { background-color: $color-table-header-bg; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/blank-layout/blank-layout.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/blank-layout/blank-layout.component.scss index 0de9b5f8c097..e5fbfa446aad 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/blank-layout/blank-layout.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/blank-layout/blank-layout.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; ::ng-deep #toast-container { margin-top: 2vw; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/login-layout/login-layout.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/login-layout/login-layout.component.scss index c88a7664bc9c..c428fc2a71e2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/login-layout/login-layout.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/login-layout/login-layout.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; ::ng-deep .login { color: $color-login-row-text; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.scss index 78884d1a4b9a..71366d038350 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; .dashboard { background-color: $color-whitesmoke-gray; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.scss index da02057afae9..3025e8358cb6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; .breadcrumb { padding: 8px 0; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.scss index 0000dd3337ed..c3c0f942f6dd 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; /* --------------------------------------------------- NAVBAR STYLE diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.scss index 8a2269b1c466..5c7eb75377fa 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; .running i { color: $color-primary; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.scss index 199adf5b6a1e..e2844d0debbb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; i { color: $color-helper-bg; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.scss index bdb7491a7bad..5a7248f53774 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; .modal-header { @include hf; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.scss index 8f5d577e8b4e..0bfe19fbd857 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; :host { position: fixed; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.scss index 9bda676bee64..925ef0df6a7d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; .badge-remove { color: $color-solid-white; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.scss index 6145f0bf4c73..a5942d0c218e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; .select-menu-item { display: block; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.scss index ec7d98291e8c..ef4ae7a322bc 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.scss @@ -1,4 +1,4 @@ -@import '../../../../styles/chart-tooltip.scss'; +@import 'chart-tooltip.scss'; .chart-container { position: static !important; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.scss index 6d178b4738ef..d71e282a2d38 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; .bg-info { background-color: $color-progress-bar-info-bg !important; diff --git a/src/pybind/mgr/dashboard/frontend/src/styles.scss b/src/pybind/mgr/dashboard/frontend/src/styles.scss index bb883e43ec01..4b82d206e5b4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/styles.scss +++ b/src/pybind/mgr/dashboard/frontend/src/styles.scss @@ -1,5 +1,5 @@ /* You can add global styles to this file, and also import other style files */ -@import 'defaults'; +@import 'defaults.scss'; // Angular2-Tree Component @import '~angular-tree-component/dist/angular-tree-component.css'; diff --git a/src/pybind/mgr/dashboard/frontend/src/styles/chart-tooltip.scss b/src/pybind/mgr/dashboard/frontend/src/styles/chart-tooltip.scss index 3a574dfa5386..477f95a8e06e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/styles/chart-tooltip.scss +++ b/src/pybind/mgr/dashboard/frontend/src/styles/chart-tooltip.scss @@ -1,4 +1,4 @@ -@import 'defaults'; +@import 'defaults.scss'; .chart-container { position: absolute; diff --git a/src/pybind/mgr/dashboard/frontend/src/styles/vendor.overrides.scss b/src/pybind/mgr/dashboard/frontend/src/styles/vendor.overrides.scss index 0cca9de8f024..ac78087b6363 100644 --- a/src/pybind/mgr/dashboard/frontend/src/styles/vendor.overrides.scss +++ b/src/pybind/mgr/dashboard/frontend/src/styles/vendor.overrides.scss @@ -1,3 +1,3 @@ /* Vendor specific scss */ -@import 'defaults'; +@import 'defaults.scss';