Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(styles): restore use of globals/imports.scss #12175

Merged
merged 3 commits into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
@use '@carbon/styles/scss/spacing' as *;
@use '@carbon/styles/scss/theme' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
m4olivei marked this conversation as resolved.
Show resolved Hide resolved
@use '../../globals/utils/ratio-base' as *;
@use '@carbon/styles/scss/components/slider';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
@use '@carbon/styles/scss/spacing' as *;
@use '@carbon/styles/scss/theme' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '@carbon/styles/scss/components/button' as *;

@mixin back-to-top {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
@use '@carbon/styles/scss/utilities' as *;
@use '@carbon/web-components/scss/components/tooltip/tooltip' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../image';

@mixin background-media {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
@use '@carbon/styles/scss/motion' as *;
@use '@carbon/styles/scss/spacing' as *;
@use '@carbon/styles/scss/utilities/convert' as *;

@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../lightbox-media-viewer';
@use '../button';

Expand Down
1 change: 1 addition & 0 deletions packages/styles/scss/components/button/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@use '@carbon/styles/scss/layout' as *;
@use '@carbon/styles/scss/components/button' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;

@mixin button {
:host(#{$c4d-prefix}-button) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@use '@carbon/styles/scss/theme' as *;
@use '@carbon/styles/scss/type' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../globals/utils/hang' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../internal/callout/callout' as *;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@use '@carbon/styles/scss/utilities' as *;
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../internal/callout/callout' as *;
@use '../../internal/content-block';
@use '../../internal/content-item/content-item';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../globals/utils/ratio-base' as *;
@use '../../internal/content-section';
@use '../card';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@use '@carbon/styles/scss/theme' as *;
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../globals/utils/aspect-ratio';
@use '../../globals/utils/ratio-base' as *;
@use '../image';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
@use '@carbon/styles/scss/theme' as *;
@use '@carbon/styles/scss/type' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../card';

@mixin card-link {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
*/

@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../internal/content-section/content-section';
@use '../card-group/card-group';
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
@use '@carbon/styles/scss/type' as *;
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../card-group/card-group';

@mixin card-section-offset {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
*/

@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../internal/content-section/content-section';
@use '../card-group/card-group';
1 change: 1 addition & 0 deletions packages/styles/scss/components/card/_card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
@use '@carbon/styles/scss/theme' as *;
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../globals/utils/content-width' as *;
@use '../../globals/utils/ratio-base' as *;
@use '../lightbox-media-viewer/lightbox-media-viewer';
Expand Down
1 change: 1 addition & 0 deletions packages/styles/scss/components/carousel/_carousel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
@use '@carbon/styles/scss/type' as *;
@use '@carbon/styles/scss/components/button' as *;
@use '@carbon/ibmdotcom-styles/scss/globals/vars' as *;
@use '../../globals/imports' as *;

@mixin carousel {
:host(#{$c4d-prefix}-carousel),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
@use '@carbon/styles/scss/spacing' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../internal/content-block';
@use '../card-group/card-group';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@use '@carbon/styles/scss/theme' as *;
@use '@carbon/styles/scss/type' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/utils/hang' as *;
@use '../../internal/content-block';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@use '../../internal/content-block';
@use '../content-item-row';
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;

@mixin content-block-horizontal {
:host(#{$c4d-prefix}-content-block-horizontal) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
@use '@carbon/styles/scss/themes' as *;
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../internal/content-block';
@use '../../internal/content-group';
@use '../../internal/content-item/content-item';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../internal/content-block';
@use '../../internal/content-group';
@use '../content-group-cards';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
@use '@carbon/styles/scss/config' as *;
@use '@carbon/styles/scss/spacing' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../internal/content-block';
@use '../../internal/content-group';
@use '../../internal/content-item/content-item';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@use '@carbon/styles/scss/config' as *;
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../internal/content-block';
@use '../../internal/content-item/content-item';
@use '../image';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
@use '@carbon/styles/scss/spacing' as *;
@use '@carbon/styles/scss/theme' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../internal/content-group';
@use '../link-with-icon';
@use '../card';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
@use '@carbon/styles/scss/config' as *;
@use '@carbon/styles/scss/spacing' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../pictogram-item';

@mixin content-group-pictograms {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
@use '@carbon/styles/scss/config' as *;
@use '@carbon/styles/scss/spacing' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../internal/content-group';

@mixin content-group-simple {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
@use '@carbon/ibmdotcom-styles/scss/internal/content-block';
@use '@carbon/ibmdotcom-styles/scss/internal/content-group';
@use '@carbon/ibmdotcom-styles/scss/globals/vars' as *;
@use '../../globals/imports' as *;

@mixin content-group {
:host(#{$c4d-prefix}-content-group),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@use '@carbon/styles/scss/utilities' as *;
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../link-list';

@mixin content-item-row-media {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../link-list';

@mixin content-item-row {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../internal/content-block';
@use '../../internal/content-item/content-item';
@use '../button-group';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@use '@carbon/styles/scss/type' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../internal/content-block';
@use '../../internal/content-item/content-item';
@use '../button-group';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@use '@carbon/styles/scss/config' as *;
@use '@carbon/styles/scss/spacing' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../footer';
@use '../masthead';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@use 'sass:math';

@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '@carbon/styles/scss/breakpoint' as *;
@use '@carbon/styles/scss/config' as *;
@use '@carbon/styles/scss/motion' as *;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
@use '@carbon/styles/scss/type' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../components/image';
@use '../../components/card';
@use '../../globals/utils/aspect-ratio' as *;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
@use '@carbon/styles/scss/spacing' as *;
@use '@carbon/styles/scss/theme' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../globals/utils/aspect-ratio';
@use '../../globals/carbon-grid';
@use '../../globals/utils/ratio-base' as *;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
@use '@carbon/web-components/scss/components/accordion/accordion';
@use '@carbon/web-components/scss/components/modal/modal';
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;

@mixin filter-panel {
.#{$prefix}--filter__heading {
Expand Down
1 change: 1 addition & 0 deletions packages/styles/scss/components/footer/_footer-logo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;

/// Footer title styles
/// @access private
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@use '@carbon/styles/scss/type' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;

/// Footer nav group styles
/// @access private
Expand Down
1 change: 1 addition & 0 deletions packages/styles/scss/components/footer/_footer-nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
@use '@carbon/styles/scss/themes' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;

/// Footer nav styles
/// @access private
Expand Down
1 change: 1 addition & 0 deletions packages/styles/scss/components/footer/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
@use '@carbon/styles/scss/layout' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;

@use '@carbon/styles/scss/components/accordion';
@use '@carbon/styles/scss/components/combo-box';
Expand Down
1 change: 1 addition & 0 deletions packages/styles/scss/components/footer/_legal-nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
@use '@carbon/styles/scss/themes' as *;
@use '@carbon/styles/scss/type' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../globals/utils/flex-grid' as *;

/// Legal nav styles
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
@use '@carbon/styles/scss/type' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;

/// Footer locale button
/// @access private
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../image/index';

@mixin global-banner {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@use '@carbon/styles/scss/utilities/convert' as *;
@use '@carbon/styles/scss/theme' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;

@mixin horizontal-rule {
$subtle-contrast: $border-subtle-01;
Expand Down
1 change: 1 addition & 0 deletions packages/styles/scss/components/image/_image.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/

@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../globals/utils/ratio-base' as *;
@use '@carbon/styles/scss/config' as *;
@use '@carbon/styles/scss/spacing' as *;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
@use '@carbon/styles/scss/spacing' as *;
@use '@carbon/styles/scss/theme' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../internal/content-group';
@use '../../globals/tokens/color-tokens' as *;

Expand Down
1 change: 1 addition & 0 deletions packages/styles/scss/components/layout/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@use '@carbon/styles/scss/theme' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;

// $carbon--layouts has been replaced by standard spacing tokens
$layout-spacings: $spacing-05, $spacing-06, $spacing-07, $spacing-09,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
@use '../../globals/utils/content-width' as *;
@use '../../globals/utils/hang' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../link-list';
@use '../image';
@use '../../internal/content-block';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../../internal/content-block';
@use '../leadspace-block';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/utils/ratio-base' as *;
@use '../../globals/vars' as *;
@use '../../globals/imports' as *;
@use '../button-group';
@use '../image';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@use '@carbon/styles/scss/type' as *;
@use '@carbon/web-components/scss/components/modal/modal' as *;
@use '@carbon/ibmdotcom-styles/scss/globals/vars' as *;
@use '../../globals/imports' as *;

@mixin leaving-ibm {
:host(#{$c4d-prefix}-leaving-ibm-composite),
Expand Down
Loading
Loading