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.

Sign up for GitHub

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(pricing-table): cell items were being horizontally squished into … #11002

Merged
merged 18 commits into from
Dec 8, 2023
Merged

fix(pricing-table): cell items were being horizontally squished into … #11002

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ef51d6f
fix(pricing-table): cell items were being horizontally squished into …
bruno-amorim Oct 4, 2023
c6bf2e3
fix(pricing-table): replicanting the test that generated the issue in…
bruno-amorim Oct 4, 2023
9dfba6a
Merge branch 'carbon-design-system:main' into pricing-table-issue-ADC…
bruno-amorim Oct 6, 2023
646a5cb
Merge branch 'carbon-design-system:main' into pricing-table-issue-ADC…
bruno-amorim Oct 10, 2023
bbe4d04
fix(pricing-table): fixing the items alignment when the cell type is …
bruno-amorim Oct 10, 2023
73a38b1
Merge branch 'carbon-design-system:main' into pricing-table-issue-ADC…
bruno-amorim Oct 11, 2023
e07027a
Merge branch 'carbon-design-system:main' into pricing-table-issue-ADC…
bruno-amorim Oct 13, 2023
98c4e30
Merge branch 'carbon-design-system:main' into pricing-table-issue-ADC…
bruno-amorim Oct 13, 2023
ca628ff
fix(pricing-table): removing unecessary css properties
bruno-amorim Oct 13, 2023
bfd35e4
Merge branch 'carbon-design-system:main' into pricing-table-issue-ADC…
bruno-amorim Oct 16, 2023
2e0211f
Merge branch 'carbon-design-system:main' into pricing-table-issue-ADC…
bruno-amorim Oct 19, 2023
aa06331
Merge branch 'carbon-design-system:main' into pricing-table-issue-ADC…
bruno-amorim Oct 19, 2023
2cfe59b
fix(pricing-table): adding more space between the items the row 3 exa…
bruno-amorim Oct 19, 2023
87dc6c1
fix(pricing-table): changing and fixing the dummy content for stories
bruno-amorim Oct 23, 2023
bd8d91a
Merge branch 'carbon-design-system:main' into pricing-table-issue-ADC…
bruno-amorim Nov 8, 2023
514d66b
Merge branch 'carbon-design-system:main' into pricing-table-issue-ADC…
bruno-amorim Nov 13, 2023
6e424fc
removing text from row with icon for stories
bruno-amorim Nov 13, 2023
f945d7d
Merge branch 'main' into pricing-table-issue-ADCMS-3714
jkaeser Nov 22, 2023
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
1 change: 1 addition & 0 deletions packages/styles/scss/components/pricing-table/_pricing-table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@

.#{$prefix}--pricing-table-cell-content {
display: flex;
flex-direction: column;
align-items: start;
jkaeser marked this conversation as resolved.
Show resolved Hide resolved
line-height: 1.25rem;

Expand Down
4 changes: 4 additions & 0 deletions packages/styles/scss/components/structured-list/_structured-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,10 @@
}
}

.#{$prefix}--structured-list-cell-icon-text-container {
display: flex;
}

.#{$prefix}--structured-list-cell-icon-text,
:host(#{$dds-prefix}-structured-list-cell)
.#{$prefix}--structured-list-cell-icon-text {
Expand Down
14 changes: 14 additions & 0 deletions packages/web-components/src/components/pricing-table/__stories__/pricing-table.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,16 @@ const renderBodyCell = (
<dds-pricing-table-cell-annotation>
Sed quis neque ultrices, convallis augue non, scelerisque massa.
</dds-pricing-table-cell-annotation>
<dds-tag-group data-autoid="dds--tag-group" role="list">
<bx-tag type="green" size=""> This is a tag</bx-tag>
<bx-tag type="blue" size=""> This is a tag</bx-tag>
</dds-tag-group>
<dds-cta
cta-style="text"
href="https://www.ibm.com/"
cta-type="local">
Lorem Ipsum
</dds-cta>
</dds-pricing-table-cell>
`;
case CELL_TYPES.ICON:
Expand All @@ -160,6 +170,10 @@ const renderBodyCell = (
<dds-pricing-table-cell-annotation>
Sed quis neque ultrices, convallis augue non, scelerisque massa.
</dds-pricing-table-cell-annotation>
<dds-tag-group data-autoid="dds--tag-group" role="list">
<bx-tag type="green" size=""> This is a tag</bx-tag>
<bx-tag type="blue" size=""> This is a tag</bx-tag>
</dds-tag-group>
</dds-pricing-table-cell>
`;
default:
Expand Down
10 changes: 7 additions & 3 deletions packages/web-components/src/components/structured-list/structured-list-cell.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import DDSStructuredListGroup from './structured-list-group';
import styles from './structured-list.scss';
import { carbonElement as customElement } from '../../internal/vendor/@carbon/web-components/globals/decorators/carbon-element.js';
import settings from 'carbon-components/es/globals/js/settings';
import { ifDefined } from 'lit-html/directives/if-defined.js';

const { prefix } = settings;
const { stablePrefix: ddsPrefix } = ddsSettings;
Expand Down Expand Up @@ -57,10 +58,13 @@ class DDSStructuredListCell extends BXStructuredListCell {
private _renderIcon() {
const { icon, _iconsAllowed: iconMap } = this;

return html`${iconMap[icon!.toLowerCase()].call()}
return html` <div
class="${prefix}--structured-list-cell-icon-text-container">
${iconMap[icon!.toLowerCase()].call()}
<span class="${prefix}--structured-list-cell-icon-text">
<slot></slot>
</span>`;
</span>
</div>`;
}

private _renderTags() {
Expand All @@ -81,7 +85,7 @@ class DDSStructuredListCell extends BXStructuredListCell {
return html`
<bx-tooltip-icon
alignment="start"
body-text="${tooltip}"
body-text="${ifDefined(tooltip)}"
direction="right">
${Info16()}
</bx-tooltip-icon>
Expand Down
Loading