renamed global.scss as component-base and moved to component layer

alexgetty · alexgetty · commit ceab303ce6ac · 2021-01-20T12:18:26.000-07:00
diff --git a/src/assets/scss/6-components/_component-base.scss b/src/assets/scss/6-components/_component-base.scss
@@ -0,0 +1,11 @@
+/*------------------------------------*\
+  Component base SCSS import file
+  -------------------------------
+  Imported directly into individual
+  component SCSS files. Anything added
+  is imported into every component.
+\*------------------------------------*/
+
+@import "../0-vendor/__vendor";
+@import "../1-settings/__settings";
+@import "../2-tools/__tools";
diff --git a/src/assets/scss/7-utilities/__utilities.scss b/src/assets/scss/7-utilities/__utilities.scss
diff --git a/src/assets/scss/_global.scss b/src/assets/scss/_global.scss
diff --git a/src/assets/scss/andculturecode-javascript-react-components.scss b/src/assets/scss/andculturecode-javascript-react-components.scss
@@ -29,4 +29,4 @@
 @import "3-generic/__generic";
 @import "4-elements/__elements";
 @import "5-objects/__objects";
-@import "6-utilities/__utilities";
+@import "7-utilities/__utilities";
diff --git a/src/atoms/anchors/anchor.scss b/src/atoms/anchors/anchor.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 /*------------------------------------*\
   ANCHORS
diff --git a/src/atoms/buttons/button.scss b/src/atoms/buttons/button.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .c-button {
     @include font-style($font-primary, "small", #ffffff, 800, 16px);
diff --git a/src/atoms/forms/checkbox-button.scss b/src/atoms/forms/checkbox-button.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .c-checkbox-button {
     @include margin-bottom(24px);
diff --git a/src/atoms/forms/checkbox.scss b/src/atoms/forms/checkbox.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .e-checkbox {
     @include font-style(
diff --git a/src/atoms/forms/radio-button-input.scss b/src/atoms/forms/radio-button-input.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 @import "../buttons/button.scss";
 
 .c-radio {
diff --git a/src/atoms/forms/select.scss b/src/atoms/forms/select.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .c-select {
     @include icon-fill(get-color-neutral("30"));
diff --git a/src/atoms/forms/text-area.scss b/src/atoms/forms/text-area.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 textarea {
     @include placeholder() {
diff --git a/src/atoms/forms/text-input-icon.scss b/src/atoms/forms/text-input-icon.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .c-text-input-icon {
     position: relative;
diff --git a/src/atoms/progress-bar/progress-bar.scss b/src/atoms/progress-bar/progress-bar.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .c-progress-bar {
     width: 100%;
diff --git a/src/atoms/toasts/toast.scss b/src/atoms/toasts/toast.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .c-toast {
     padding-top: 0;
diff --git a/src/molecules/cards/card.scss b/src/molecules/cards/card.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .c-card {
     position: relative;
diff --git a/src/molecules/dropdown-button/dropdown-button.scss b/src/molecules/dropdown-button/dropdown-button.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .c-dropdown-button {
     svg {
diff --git a/src/molecules/errors/error-banner.scss b/src/molecules/errors/error-banner.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .c-error-banner {
     @include padding(8px, 24px, 8px, 32px);
diff --git a/src/molecules/form-fields/form-field.scss b/src/molecules/form-fields/form-field.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .c-form-field {
     @include margin-bottom(20px);
diff --git a/src/molecules/forms/form.scss b/src/molecules/forms/form.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .c-form {
     > .c-form-field {
diff --git a/src/molecules/lists/drag-and-drop-list-box.scss b/src/molecules/lists/drag-and-drop-list-box.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .c-drag-and-drop-list-box {
     .c-list-box__item {
diff --git a/src/molecules/lists/list-box.scss b/src/molecules/lists/list-box.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .c-list-box {
     background-color: get-color-neutral("05");
diff --git a/src/molecules/lists/radio-list.scss b/src/molecules/lists/radio-list.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .c-radio-list {
     > ul {
diff --git a/src/molecules/tooltips/tooltip.scss b/src/molecules/tooltips/tooltip.scss
@@ -1,4 +1,4 @@
-@import "../../assets/scss/_global";
+@import "../../assets/scss/6-components/_component-base";
 
 .c-tooltip {
     @include box-shadow(0, 7px, 20px, rgba(0, 26, 57, 0.3));

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@import "../../assets/scss/_global";`
	`1`	`+@import "../../assets/scss/6-components/_component-base";`
`2`	`2`
`3`	`3`	`/------------------------------------\`
`4`	`4`	`ANCHORS`