diff --git a/css/g10.scss b/css/g10.scss index 45143412..5ac6db53 100644 --- a/css/g10.scss +++ b/css/g10.scss @@ -1,3 +1,9 @@ +// Use the "g10" (Gray 10) Carbon theme +@import "carbon-components/scss/globals/scss/vendor/@carbon/themes/scss"; + +$carbon--theme: $carbon--theme--g10; +@include carbon--theme(); + $feature-flags: ( ui-shell: true, grid-columns-16: true @@ -11,17 +17,12 @@ $css--reset: true; $css--default-type: true; $css--plex: true; -// Use the "g10" (Gray 10) Carbon theme -@import "carbon-components/scss/globals/scss/vendor/@carbon/themes/scss"; @import "carbon-components/scss/globals/scss/component-tokens"; @import "carbon-components/src/components/tag/tag"; @import "carbon-components/src/components/notification/inline-notification"; @import "carbon-components/src/components/notification/toast-notification"; @import "carbon-components-10.47/src/components/popover/popover"; -$carbon--theme: $carbon--theme--g10; -@include carbon--theme(); - @import "carbon-components/scss/globals/scss/_css--reset"; @import "carbon-components/scss/globals/scss/_css--font-face"; @import "carbon-components/scss/globals/scss/_css--helpers"; diff --git a/css/g100.scss b/css/g100.scss index 4820aa3d..5c81ecb9 100644 --- a/css/g100.scss +++ b/css/g100.scss @@ -1,3 +1,9 @@ +// Use the "g100" (Gray 100) Carbon theme +@import "carbon-components/scss/globals/scss/vendor/@carbon/themes/scss"; + +$carbon--theme: $carbon--theme--g100; +@include carbon--theme(); + $feature-flags: ( ui-shell: true, grid-columns-16: true @@ -11,17 +17,12 @@ $css--reset: true; $css--default-type: true; $css--plex: true; -// Use the "g100" (Gray 100) Carbon theme -@import "carbon-components/scss/globals/scss/vendor/@carbon/themes/scss"; @import "carbon-components/scss/globals/scss/component-tokens"; @import "carbon-components/src/components/tag/tag"; @import "carbon-components/src/components/notification/inline-notification"; @import "carbon-components/src/components/notification/toast-notification"; @import "carbon-components-10.47/src/components/popover/popover"; -$carbon--theme: $carbon--theme--g100; -@include carbon--theme(); - @import "carbon-components/scss/globals/scss/_css--reset"; @import "carbon-components/scss/globals/scss/_css--font-face"; @import "carbon-components/scss/globals/scss/_css--helpers"; diff --git a/css/g80.scss b/css/g80.scss index 4c5b49ec..8f6a46bb 100644 --- a/css/g80.scss +++ b/css/g80.scss @@ -1,3 +1,9 @@ +// Use the "g80" (Gray 80) Carbon theme +@import "carbon-components/scss/globals/scss/vendor/@carbon/themes/scss"; + +$carbon--theme: $carbon--theme--g80; +@include carbon--theme(); + $feature-flags: ( ui-shell: true, grid-columns-16: true @@ -11,17 +17,12 @@ $css--reset: true; $css--default-type: true; $css--plex: true; -// Use the "g80" (Gray 80) Carbon theme -@import "carbon-components/scss/globals/scss/vendor/@carbon/themes/scss"; @import "carbon-components/scss/globals/scss/component-tokens"; @import "carbon-components/src/components/tag/tag"; @import "carbon-components/src/components/notification/inline-notification"; @import "carbon-components/src/components/notification/toast-notification"; @import "carbon-components-10.47/src/components/popover/popover"; -$carbon--theme: $carbon--theme--g80; -@include carbon--theme(); - @import "carbon-components/scss/globals/scss/_css--reset"; @import "carbon-components/scss/globals/scss/_css--font-face"; @import "carbon-components/scss/globals/scss/_css--helpers"; diff --git a/css/g90.scss b/css/g90.scss index 2e31befd..52c648d9 100644 --- a/css/g90.scss +++ b/css/g90.scss @@ -1,3 +1,9 @@ +// Use the "g90" (Gray 90) Carbon theme +@import "carbon-components/scss/globals/scss/vendor/@carbon/themes/scss"; + +$carbon--theme: $carbon--theme--g90; +@include carbon--theme(); + $feature-flags: ( ui-shell: true, grid-columns-16: true @@ -11,17 +17,12 @@ $css--reset: true; $css--default-type: true; $css--plex: true; -// Use the "g90" (Gray 90) Carbon theme -@import "carbon-components/scss/globals/scss/vendor/@carbon/themes/scss"; @import "carbon-components/scss/globals/scss/component-tokens"; @import "carbon-components/src/components/tag/tag"; @import "carbon-components/src/components/notification/inline-notification"; @import "carbon-components/src/components/notification/toast-notification"; @import "carbon-components-10.47/src/components/popover/popover"; -$carbon--theme: $carbon--theme--g90; -@include carbon--theme(); - @import "carbon-components/scss/globals/scss/_css--reset"; @import "carbon-components/scss/globals/scss/_css--font-face"; @import "carbon-components/scss/globals/scss/_css--helpers"; diff --git a/css/white.scss b/css/white.scss index 15d1ed4f..7fbeb5c9 100644 --- a/css/white.scss +++ b/css/white.scss @@ -1,3 +1,9 @@ +// Use the "white" (White) Carbon theme +@import "carbon-components/scss/globals/scss/vendor/@carbon/themes/scss"; + +$carbon--theme: $carbon--theme--white; +@include carbon--theme(); + $feature-flags: ( ui-shell: true, grid-columns-16: true @@ -11,17 +17,12 @@ $css--reset: true; $css--default-type: true; $css--plex: true; -// Use the "white" (White) Carbon theme -@import "carbon-components/scss/globals/scss/vendor/@carbon/themes/scss"; @import "carbon-components/scss/globals/scss/component-tokens"; @import "carbon-components/src/components/tag/tag"; @import "carbon-components/src/components/notification/inline-notification"; @import "carbon-components/src/components/notification/toast-notification"; @import "carbon-components-10.47/src/components/popover/popover"; -$carbon--theme: $carbon--theme--white; -@include carbon--theme(); - @import "carbon-components/scss/globals/scss/_css--reset"; @import "carbon-components/scss/globals/scss/_css--font-face"; @import "carbon-components/scss/globals/scss/_css--helpers";