Skip to content

Commit

Permalink
Merge branch 'feat/carbon-for-ibm-dotcom-v2' into feat/footer-v2-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
ariellalgilmore authored Nov 8, 2023
2 parents 7e2453e + 94e9d94 commit 1dd6b0f
Show file tree
Hide file tree
Showing 53 changed files with 687 additions and 1,080 deletions.
63 changes: 36 additions & 27 deletions docs/dotcom-v2-migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,54 +17,57 @@ For Carbon v11 migration guidance, see their
| ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- |
| back-to-top | No API changes. |
| background-media | No API changes. |
| button | This component is deprecated in v2 in favor for `button-expressive` |
| button | This component is deprecated in v2 in favor for `button-expressive`. |
| button-group | No API changes. |
| callout-with-media | View changes [here](#callout-with-media) |
| callout-quote | View changes [here](#callout-quote) |
| card | View changes [here](#card) |
| card-group-card-link-item | This component is deprecated in v2 in favor for default card or with content-item |
| callout-with-media | View changes [here](#callout-with-media). |
| callout-quote | View changes [here](#callout-quote). |
| card | View changes [here](#card). |
| card-group-card-link-item | This component is deprecated in v2 in favor for default card or with content-item. |
| card-in-card | No API changes. |
| card-link | This component is deprecated in v2 in favor for [card](#card) (link variant) component |
| card-section-carousel | This component is deprecated in v2 in favor for content-section/block component combined with carousel |
| card-link | This component is deprecated in v2 in favor for [card](#card) (link variant) component. |
| card-section-carousel | This component is deprecated in v2 in favor for content-section/block component combined with carousel. |
| card-section-images | This component is deprecated in v1 and has been removed in v2 in favor of the card-section component. |
| card-section-simple | This component is deprecated in v2 in facor for content-section/block component combined with card-group |
| content-block-cards | This component is deprecated in v2 in favor for content-section/block & card-group components |
| content-block-horizontal | This component is deprecated in v2 in favor for content-section/block & content-item-horizontal components |
| content-block-media | This component is deprecated in v2 in favor for content-section/block & repeated video-player/image components |
| content-block-mixed | This component is deprecated in v2 in favor for content-section/block, video-player/image, pictogram-items, and other content-group components |
| content-block-segmented | This component is deprecated in v2 in favor for content-section/block component |
| content-block-simple | This component is deprecated in v2 in favor for content-section/block component |
| content-group-banner | View changes [here](#content-group-banner) |
| card-section-simple | This component is deprecated in v2 in facor for content-section/block component combined with card-group. |
| content-block-cards | This component is deprecated in v2 in favor for content-section/block & card-group components. |
| content-block-horizontal | This component is deprecated in v2 in favor for content-section/block & content-item-horizontal components. |
| content-block-media | This component is deprecated in v2 in favor for content-section/block & repeated video-player/image components. |
| content-block-mixed | This component is deprecated in v2 in favor for content-section/block, video-player/image, pictogram-items, and other content-group components.|
| content-block-segmented | This component is deprecated in v2 in favor for content-section/block component. |
| content-block-simple | This component is deprecated in v2 in favor for content-section/block component. |
| content-group-banner | View changes [here](#content-group-banner). |
| content-group-horizontal | This component is deprecated in v1 and has been removed in v2 in favor of the content-block-horizontal component. |
| content-group-cards | This component is deprecated in v2 in favor for content-section/block & card-group components |
| content-group-pictograms | This component is deprecated in v2 in favor for content-section/block content-item (pictogram variant) components |
| content-group-simple | This component is deprecated in v2 in favor for content-group, image, & content-item components |
| content-item | View changes [here](#content-item) |
| content-item | View changes [here](#content-item) |
| content-item-horizontal | View changes [here](#content-item-horizontal) |
| cta | View changes [here](#cta) |
| 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 |
| dotcom-shell | No API changes. |
| feature-card-block-large | This component is deprecated in v1 and has been removed in v2 in favor of the feature-card component. |
| feature-card-block-medium | This component is deprecated in v1 and has been removed in v2 in favor of the feature-card component. |
| feature-section | View changes [here](#feature-section) |
| filter-panel | View changes [here](#filter-panel) |
| feature-section | View changes [here](#feature-section). |
| filter-panel | View changes [here](#filter-panel). |
| footer | No API changes. |
| hr | View changes [here](#horizontal-rule) |
| image | View changes [here](#image) |
| image-with-caption | This component is deprecated in v1 and has been removed in v2 in favor of the image component |
| leadspace | View changes [here](#leadspace) |
| leadspace-block | View changes [here](#leadspace-block) |
| leadspace-with-search | View changes [here](#leadspace-with-search) |
| hr | View changes [here](#horizontal-rule). |
| image | View changes [here](#image). |
| image-with-caption | This component is deprecated in v1 and has been removed in v2 in favor of the image component. |
| leadspace | View changes [here](#leadspace). |
| leadspace-block | View changes [here](#leadspace-block). |
| leadspace-with-search | View changes [here](#leadspace-with-search). |
| lightbox-media-viewer | No API changes. |
| link-list-section | This component is deprecated in v2 in favor for content-section/block & link-list end of section variant components |
| link-list | View changes [here](#link-list). |
| link-with-icon | No API changes. |
| logo-grid | This component is deprecated in v2 in favor for content-section/block & image-group components |
| pictogram-item | This component is deprecated in v2 in favor for content-item (pictogram variation) componet |
| logo-grid | This component is deprecated in v2 in favor for content-section/block & image-group components. |
| pictogram-item | This component is deprecated in v2 in favor for content-item (pictogram variation) component. |
| quote | No API changes. |
| scroll-animations | No API changes. |
| search-with-typeahead | No API changes. |
| table-of-contents | No API changes. |
| tabs-extended-media | This component is deprecated in v2 in favor for tabs-extended component |
| tag-group | This component is deprecated in v2 in favor for wrapping core carbon `tags` in a `div` |
| tag-link | This component is deprecated in v2 in favor for core carbon's `tag` |
| universal-banner | View changes [here](#universal-banner) |

### Callout with media
Expand Down Expand Up @@ -152,6 +155,12 @@ information.
- Removed `<dds-leadspace-with-search-heading>`, `<dds-leadspace-with-search-content>`,
`<dds-leadspace-with-search-content-heading>`, `<dds-leadspace-with-search-content-copy>`

### Link list

- The `default` section has taken the design specs of `end of section`. As a result, `end of section` has been removed. In addition to this, the following components have been replaced:
- `dds-link-list-item-card` is now `dds-link-list-item`
- `dds-link-list-item-card-cta` is `dds-link-list-item-cta`

### Universal banner

- `universal-banner` renamed to `global-banner`
4 changes: 0 additions & 4 deletions packages/styles/scss/components/card/_card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,9 @@

:host(#{$c4d-prefix}-card),
:host(#{$c4d-prefix}-region-item) .#{$prefix}--link,
:host(#{$c4d-prefix}-link-list-item-card),
:host(#{$c4d-prefix}-card-group-item),
:host(#{$c4d-prefix}-card-group-item) .#{$prefix}--card,
:host(#{$c4d-prefix}-card-cta),
:host(#{$c4d-prefix}-link-list-item-card-cta),
:host(#{$c4d-prefix}-card-in-card),
:host(#{$c4d-prefix}-content-group-cards-item),
:host(#{$c4d-prefix}-content-group-cards-item) .#{$prefix}--card {
Expand Down Expand Up @@ -634,10 +632,8 @@

@media print {
:host(#{$c4d-prefix}-card),
:host(#{$c4d-prefix}-link-list-item-card),
:host(#{$c4d-prefix}-card-group-item),
:host(#{$c4d-prefix}-card-cta),
:host(#{$c4d-prefix}-link-list-item-card-cta),
:host(#{$c4d-prefix}-card-in-card),
:host(#{$c4d-prefix}-content-group-cards-item) {
border: 1px solid $layer-accent-01;
Expand Down
37 changes: 37 additions & 0 deletions packages/styles/scss/components/content-group/_content-group.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
//
// Copyright IBM Corp. 2020, 2023
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@use '@carbon/styles/scss/type' as *;
@use '@carbon/styles/scss/config' as *;
@use '@carbon/ibmdotcom-styles/scss/internal/content-block';
@use '@carbon/ibmdotcom-styles/scss/internal/content-group';
@use '@carbon/ibmdotcom-styles/scss/globals/vars' as *;

@mixin content-group {
:host(#{$c4d-prefix}-content-group),
:host(#{$c4d-prefix}-content-group-copy),
:host(#{$c4d-prefix}-content-group-paragraph) {
display: block;
}

:host(#{$c4d-prefix}-content-group-copy) {
@include type-style('body-02');
}
:host(#{$c4d-prefix}-content-group-heading),
:host(#{$c4d-prefix}-content-group-copy) {
max-width: 40rem;
}
:host(#{$c4d-prefix}-content-group) {
::slotted([slot='footer']) {
background: none;
height: auto;
}
}
.#{$prefix}--content-layout__body {
display: block;
}
}
11 changes: 11 additions & 0 deletions packages/styles/scss/components/content-group/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Copyright IBM Corp. 2018, 2023
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@forward 'content-group';
@use 'content-group';

@include content-group.content-group;
11 changes: 11 additions & 0 deletions packages/styles/scss/components/link-list-section/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Copyright IBM Corp. 2018, 2023
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@forward 'link-list-section';
@use 'link-list-section';

@include link-list-section.link-list-section;
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
//
// Copyright IBM Corp. 2020, 2021
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@use '@carbon/styles/scss/breakpoint' as *;
@use '@carbon/styles/scss/config' as *;
@use '@carbon/styles/scss/spacing' as *;
@use '@carbon/ibmdotcom-styles/scss/internal/content-section';
@use '@carbon/ibmdotcom-styles/scss/globals/utils/flex-grid' as *;
@use '@carbon/ibmdotcom-styles/scss/globals/vars' as *;

@mixin link-list-section {
:host(#{$c4d-prefix}-link-list-section) {
display: block;

.#{$prefix}--content-section__left {
padding-top: 0;
}

.#{$prefix}--content-section__children {
margin-top: 0;

@include breakpoint(lg) {
@include make-col(8, 16);
}
}

::slotted(#{$c4d-prefix}-content-section-heading) {
margin-bottom: 0;
}
}
}
Loading

0 comments on commit 1dd6b0f

Please sign in to comment.