Skip to content

Commit

Permalink
Merge branch 'feat/carbon-for-ibm-dotcom-v2' into feat/quote-color-sc…
Browse files Browse the repository at this point in the history
…heme
  • Loading branch information
kennylam authored Nov 14, 2023
2 parents fe1a313 + fca0adc commit 3d29e91
Show file tree
Hide file tree
Showing 18 changed files with 276 additions and 208 deletions.
13 changes: 13 additions & 0 deletions packages/styles/icons/svg/IBM-8bar-logo--h23-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion packages/styles/scss/components/footer/_footer-logo.scss
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 '@carbon/styles/scss/themes' as *;
@use '@carbon/styles/scss/utilities' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;

Expand All @@ -22,7 +23,7 @@
@mixin footer-logo {
:host(#{$c4d-prefix}-footer-logo),
.#{$prefix}--footer-logo {
@include theme($g90, feature-flag-enabled('enable-css-custom-properties'));
@include theme($g100, feature-flag-enabled('enable-css-custom-properties'));

&:focus-visible {
outline: none;
Expand Down Expand Up @@ -61,4 +62,14 @@
display: inline-block;
width: 128px;
}

:host(#{$c4d-prefix}-footer-logo[size='micro']) {
align-self: center;
margin: 0;

@include breakpoint-between(md, lg) {
position: absolute;
bottom: rem(58.5px);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:host(#{$c4d-prefix}-footer-nav-group),
.#{$prefix}--footer-nav-group,
.#{$prefix}--footer-nav-group.#{$prefix}--accordion__item {
@include theme($g90, feature-flag-enabled('enable-css-custom-properties'));
@include theme($g100, feature-flag-enabled('enable-css-custom-properties'));

padding-left: 0;
display: block;
Expand All @@ -47,10 +47,6 @@
}
}

.#{$prefix}--accordion__title {
margin: 0 0 0 $spacing-05;
}

.#{$prefix}--accordion__arrow {
margin: 2px $spacing-05 0 0;
}
Expand Down
17 changes: 9 additions & 8 deletions packages/styles/scss/components/footer/_footer-nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

@mixin footer-nav {
:host(#{$c4d-prefix}-footer-nav) {
@include theme($g90, feature-flag-enabled('enable-css-custom-properties'));
@include theme($g100, feature-flag-enabled('enable-css-custom-properties'));

@include accordion;
@include make-col-ready;
Expand All @@ -31,18 +31,11 @@
order: 1;

@include breakpoint(md) {
border-top: 1px solid $layer-accent-01;
padding: 0 calc($grid-gutter / 2);
}

@include breakpoint-between(md, lg) {
padding-top: $spacing-04;
}

@include breakpoint(lg) {
padding-top: $spacing-05;
@include make-col(12, 16);
@include make-col-offset(4, 16);
}

.#{$prefix}--accordion__heading {
Expand All @@ -51,6 +44,14 @@
min-height: $spacing-09;
padding: 0;
}

::slotted([slot='locale-button']),
::slotted([slot='language-selector']) {
display: inline-block;
margin-left: 0;
width: 100%;
max-width: 100%;
}
}

:host(#{$c4d-prefix}-footer-nav[disable-locale-button]),
Expand Down
Loading

0 comments on commit 3d29e91

Please sign in to comment.