From e11454cf71c5c34b0c9c25ec6890f3181a57d876 Mon Sep 17 00:00:00 2001 From: John Cowen Date: Wed, 26 May 2021 15:08:57 +0100 Subject: [PATCH] ui: Colocate old base components into our app/component folder (#10275) --- .../base => }/components/anchors/index.scss | 0 .../base => }/components/breadcrumbs/index.scss | 0 .../base => }/components/breadcrumbs/layout.scss | 0 .../base => }/components/breadcrumbs/skin.scss | 0 .../base => }/components/buttons/index.scss | 0 .../base => }/components/buttons/layout.scss | 0 .../{styles/base => }/components/buttons/skin.scss | 0 .../base => }/components/checkbox-group/index.scss | 0 .../components/checkbox-group/layout.scss | 0 .../base => }/components/checkbox-group/skin.scss | 0 .../base => }/components/display-toggle/index.scss | 0 .../components/display-toggle/layout.scss | 0 .../base => }/components/display-toggle/skin.scss | 0 .../base => }/components/form-elements/index.scss | 0 .../base => }/components/form-elements/layout.scss | 0 .../base => }/components/form-elements/skin.scss | 0 .../base => }/components/inline-alert/index.scss | 0 .../base => }/components/inline-alert/layout.scss | 0 .../base => }/components/inline-alert/skin.scss | 0 .../{styles/base => }/components/pill/index.scss | 0 .../{styles/base => }/components/pill/layout.scss | 0 .../{styles/base => }/components/pill/skin.scss | 0 .../base => }/components/popover-menu/index.scss | 0 .../base => }/components/popover-menu/layout.scss | 0 .../base => }/components/popover-menu/skin.scss | 0 .../base => }/components/radio-group/index.scss | 0 .../base => }/components/radio-group/layout.scss | 0 .../base => }/components/radio-group/skin.scss | 0 .../base => }/components/sliding-toggle/index.scss | 0 .../components/sliding-toggle/layout.scss | 0 .../base => }/components/sliding-toggle/skin.scss | 0 .../{styles/base => }/components/table/index.scss | 0 .../{styles/base => }/components/table/layout.scss | 0 .../{styles/base => }/components/table/skin.scss | 0 .../base => }/components/toggle-button/index.scss | 0 .../base => }/components/toggle-button/layout.scss | 0 .../base => }/components/toggle-button/skin.scss | 0 .../app/styles/base/components/index.scss | 13 ------------- ui/packages/consul-ui/app/styles/components.scss | 14 +++++++++++++- 39 files changed, 13 insertions(+), 14 deletions(-) rename ui/packages/consul-ui/app/{styles/base => }/components/anchors/index.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/breadcrumbs/index.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/breadcrumbs/layout.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/breadcrumbs/skin.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/buttons/index.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/buttons/layout.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/buttons/skin.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/checkbox-group/index.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/checkbox-group/layout.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/checkbox-group/skin.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/display-toggle/index.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/display-toggle/layout.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/display-toggle/skin.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/form-elements/index.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/form-elements/layout.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/form-elements/skin.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/inline-alert/index.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/inline-alert/layout.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/inline-alert/skin.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/pill/index.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/pill/layout.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/pill/skin.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/popover-menu/index.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/popover-menu/layout.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/popover-menu/skin.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/radio-group/index.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/radio-group/layout.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/radio-group/skin.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/sliding-toggle/index.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/sliding-toggle/layout.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/sliding-toggle/skin.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/table/index.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/table/layout.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/table/skin.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/toggle-button/index.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/toggle-button/layout.scss (100%) rename ui/packages/consul-ui/app/{styles/base => }/components/toggle-button/skin.scss (100%) delete mode 100644 ui/packages/consul-ui/app/styles/base/components/index.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/anchors/index.scss b/ui/packages/consul-ui/app/components/anchors/index.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/anchors/index.scss rename to ui/packages/consul-ui/app/components/anchors/index.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/breadcrumbs/index.scss b/ui/packages/consul-ui/app/components/breadcrumbs/index.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/breadcrumbs/index.scss rename to ui/packages/consul-ui/app/components/breadcrumbs/index.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/breadcrumbs/layout.scss b/ui/packages/consul-ui/app/components/breadcrumbs/layout.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/breadcrumbs/layout.scss rename to ui/packages/consul-ui/app/components/breadcrumbs/layout.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/breadcrumbs/skin.scss b/ui/packages/consul-ui/app/components/breadcrumbs/skin.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/breadcrumbs/skin.scss rename to ui/packages/consul-ui/app/components/breadcrumbs/skin.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/buttons/index.scss b/ui/packages/consul-ui/app/components/buttons/index.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/buttons/index.scss rename to ui/packages/consul-ui/app/components/buttons/index.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/buttons/layout.scss b/ui/packages/consul-ui/app/components/buttons/layout.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/buttons/layout.scss rename to ui/packages/consul-ui/app/components/buttons/layout.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/buttons/skin.scss b/ui/packages/consul-ui/app/components/buttons/skin.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/buttons/skin.scss rename to ui/packages/consul-ui/app/components/buttons/skin.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/checkbox-group/index.scss b/ui/packages/consul-ui/app/components/checkbox-group/index.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/checkbox-group/index.scss rename to ui/packages/consul-ui/app/components/checkbox-group/index.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/checkbox-group/layout.scss b/ui/packages/consul-ui/app/components/checkbox-group/layout.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/checkbox-group/layout.scss rename to ui/packages/consul-ui/app/components/checkbox-group/layout.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/checkbox-group/skin.scss b/ui/packages/consul-ui/app/components/checkbox-group/skin.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/checkbox-group/skin.scss rename to ui/packages/consul-ui/app/components/checkbox-group/skin.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/display-toggle/index.scss b/ui/packages/consul-ui/app/components/display-toggle/index.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/display-toggle/index.scss rename to ui/packages/consul-ui/app/components/display-toggle/index.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/display-toggle/layout.scss b/ui/packages/consul-ui/app/components/display-toggle/layout.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/display-toggle/layout.scss rename to ui/packages/consul-ui/app/components/display-toggle/layout.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/display-toggle/skin.scss b/ui/packages/consul-ui/app/components/display-toggle/skin.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/display-toggle/skin.scss rename to ui/packages/consul-ui/app/components/display-toggle/skin.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/form-elements/index.scss b/ui/packages/consul-ui/app/components/form-elements/index.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/form-elements/index.scss rename to ui/packages/consul-ui/app/components/form-elements/index.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/form-elements/layout.scss b/ui/packages/consul-ui/app/components/form-elements/layout.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/form-elements/layout.scss rename to ui/packages/consul-ui/app/components/form-elements/layout.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/form-elements/skin.scss b/ui/packages/consul-ui/app/components/form-elements/skin.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/form-elements/skin.scss rename to ui/packages/consul-ui/app/components/form-elements/skin.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/inline-alert/index.scss b/ui/packages/consul-ui/app/components/inline-alert/index.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/inline-alert/index.scss rename to ui/packages/consul-ui/app/components/inline-alert/index.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/inline-alert/layout.scss b/ui/packages/consul-ui/app/components/inline-alert/layout.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/inline-alert/layout.scss rename to ui/packages/consul-ui/app/components/inline-alert/layout.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/inline-alert/skin.scss b/ui/packages/consul-ui/app/components/inline-alert/skin.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/inline-alert/skin.scss rename to ui/packages/consul-ui/app/components/inline-alert/skin.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/pill/index.scss b/ui/packages/consul-ui/app/components/pill/index.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/pill/index.scss rename to ui/packages/consul-ui/app/components/pill/index.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/pill/layout.scss b/ui/packages/consul-ui/app/components/pill/layout.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/pill/layout.scss rename to ui/packages/consul-ui/app/components/pill/layout.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/pill/skin.scss b/ui/packages/consul-ui/app/components/pill/skin.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/pill/skin.scss rename to ui/packages/consul-ui/app/components/pill/skin.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/popover-menu/index.scss b/ui/packages/consul-ui/app/components/popover-menu/index.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/popover-menu/index.scss rename to ui/packages/consul-ui/app/components/popover-menu/index.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/popover-menu/layout.scss b/ui/packages/consul-ui/app/components/popover-menu/layout.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/popover-menu/layout.scss rename to ui/packages/consul-ui/app/components/popover-menu/layout.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/popover-menu/skin.scss b/ui/packages/consul-ui/app/components/popover-menu/skin.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/popover-menu/skin.scss rename to ui/packages/consul-ui/app/components/popover-menu/skin.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/radio-group/index.scss b/ui/packages/consul-ui/app/components/radio-group/index.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/radio-group/index.scss rename to ui/packages/consul-ui/app/components/radio-group/index.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/radio-group/layout.scss b/ui/packages/consul-ui/app/components/radio-group/layout.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/radio-group/layout.scss rename to ui/packages/consul-ui/app/components/radio-group/layout.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/radio-group/skin.scss b/ui/packages/consul-ui/app/components/radio-group/skin.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/radio-group/skin.scss rename to ui/packages/consul-ui/app/components/radio-group/skin.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/sliding-toggle/index.scss b/ui/packages/consul-ui/app/components/sliding-toggle/index.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/sliding-toggle/index.scss rename to ui/packages/consul-ui/app/components/sliding-toggle/index.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/sliding-toggle/layout.scss b/ui/packages/consul-ui/app/components/sliding-toggle/layout.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/sliding-toggle/layout.scss rename to ui/packages/consul-ui/app/components/sliding-toggle/layout.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/sliding-toggle/skin.scss b/ui/packages/consul-ui/app/components/sliding-toggle/skin.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/sliding-toggle/skin.scss rename to ui/packages/consul-ui/app/components/sliding-toggle/skin.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/table/index.scss b/ui/packages/consul-ui/app/components/table/index.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/table/index.scss rename to ui/packages/consul-ui/app/components/table/index.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/table/layout.scss b/ui/packages/consul-ui/app/components/table/layout.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/table/layout.scss rename to ui/packages/consul-ui/app/components/table/layout.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/table/skin.scss b/ui/packages/consul-ui/app/components/table/skin.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/table/skin.scss rename to ui/packages/consul-ui/app/components/table/skin.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/toggle-button/index.scss b/ui/packages/consul-ui/app/components/toggle-button/index.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/toggle-button/index.scss rename to ui/packages/consul-ui/app/components/toggle-button/index.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/toggle-button/layout.scss b/ui/packages/consul-ui/app/components/toggle-button/layout.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/toggle-button/layout.scss rename to ui/packages/consul-ui/app/components/toggle-button/layout.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/toggle-button/skin.scss b/ui/packages/consul-ui/app/components/toggle-button/skin.scss similarity index 100% rename from ui/packages/consul-ui/app/styles/base/components/toggle-button/skin.scss rename to ui/packages/consul-ui/app/components/toggle-button/skin.scss diff --git a/ui/packages/consul-ui/app/styles/base/components/index.scss b/ui/packages/consul-ui/app/styles/base/components/index.scss deleted file mode 100644 index 2280b706b7..0000000000 --- a/ui/packages/consul-ui/app/styles/base/components/index.scss +++ /dev/null @@ -1,13 +0,0 @@ -@import './anchors/index'; -@import './breadcrumbs/index'; -@import './buttons/index'; -@import './checkbox-group/index'; -@import './display-toggle/index'; -@import './form-elements/index'; -@import './inline-alert/index'; -@import './pill/index'; -@import './popover-menu/index'; -@import './radio-group/index'; -@import './sliding-toggle/index'; -@import './table/index'; -@import './toggle-button/index'; diff --git a/ui/packages/consul-ui/app/styles/components.scss b/ui/packages/consul-ui/app/styles/components.scss index 16aac17300..c28229241d 100644 --- a/ui/packages/consul-ui/app/styles/components.scss +++ b/ui/packages/consul-ui/app/styles/components.scss @@ -1,5 +1,17 @@ -@import './base/components/index'; @import 'ember-power-select'; +@import 'consul-ui/components/anchors/index'; +@import 'consul-ui/components/breadcrumbs/index'; +@import 'consul-ui/components/buttons/index'; +@import 'consul-ui/components/checkbox-group/index'; +@import 'consul-ui/components/display-toggle/index'; +@import 'consul-ui/components/form-elements/index'; +@import 'consul-ui/components/inline-alert/index'; +@import 'consul-ui/components/pill/index'; +@import 'consul-ui/components/popover-menu/index'; +@import 'consul-ui/components/radio-group/index'; +@import 'consul-ui/components/sliding-toggle/index'; +@import 'consul-ui/components/table/index'; +@import 'consul-ui/components/toggle-button/index'; /**/