Skip to content

Commit

Permalink
Merge branch 'feat/carbon-for-ibm-dotcom-v2' into feat/feature-sectio…
Browse files Browse the repository at this point in the history
…n-v2
  • Loading branch information
ariellalgilmore authored Sep 21, 2023
2 parents 26e75e9 + 5519067 commit bceffd9
Show file tree
Hide file tree
Showing 17 changed files with 571 additions and 539 deletions.
1 change: 1 addition & 0 deletions docs/dotcom-v2-migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ For Carbon v11 migration guidance, see their
| cta-block | This component is deprecated in v2 in favor for content-section/block & content-item components |
| cta-section | This component is deprecated in v2 in favor for content-section/block & content-item components |
| feature-section | View changes [here](#feature-section) |
| footer | No API changes. |
| hr | View changes [here](#horizontal-rule) |
| image | View changes [here](#image) |
| image-with-caption | Replaced by `image` |
Expand Down
2 changes: 1 addition & 1 deletion packages/styles/icons/svg/IBM-8bar-logo--h65-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions packages/styles/scss/components/footer/_footer-logo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
}
}

.#{$prefix}--footer-logo__link {
.#{$c4d-prefix}--footer-logo__link {
$logo-padding: math.div($grid-gutter, 2);
$logo-size: carbon--mini-units(16) + ($logo-padding * 2);
$logo-size: 8rem + ($logo-padding * 2);

color: $text-on-color;
padding-left: $logo-padding;
Expand All @@ -56,7 +56,7 @@
}
}

.#{$prefix}--footer-logo__logo {
.#{$c4d-prefix}--footer-logo__logo {
fill: currentColor;
display: inline-block;
width: 128px;
Expand Down
21 changes: 18 additions & 3 deletions packages/styles/scss/components/footer/_footer-nav-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
display: block;

&:last-child {
margin-bottom: carbon--mini-units(6);
margin-bottom: $spacing-09;
border-bottom: 1px solid $layer-accent-01;

@include breakpoint(md) {
Expand All @@ -39,14 +39,28 @@
.#{$prefix}--accordion__content {
padding-left: 0;
padding-right: 0;

ul {
list-style: none;
padding-inline-start: 0;
margin: 0;
}
}

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

.#{$prefix}--accordion__arrow {
margin: 2px $spacing-05 0 0;
}

@include breakpoint(md) {
@include make-col-ready;

padding-left: 0;
display: inline-block;
margin-bottom: carbon--mini-units(6);
margin-bottom: $spacing-09;

&.#{$prefix}--accordion__item {
border-top: 0 transparent;
Expand Down Expand Up @@ -112,11 +126,12 @@
@include breakpoint(md) {
.#{$prefix}--footer-nav-group__title {
display: block;
margin: 0;
}

:host(#{$c4d-prefix}-footer-nav-item),
.#{$prefix}--footer-nav-group__item {
margin-top: carbon--mini-units(1);
margin-top: $spacing-03;
}
}
}
7 changes: 3 additions & 4 deletions packages/styles/scss/components/footer/_footer-nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
/// @group footer

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

@include accordion;
Expand All @@ -34,11 +33,11 @@

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

@include breakpoint-between('md', $TEMP--breakpoint-down--lg) {
padding-top: carbon--mini-units(2);
padding-top: $spacing-04;
}

@include breakpoint(lg) {
Expand Down
Loading

0 comments on commit bceffd9

Please sign in to comment.