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

Jump to bottom

fix(styles): update border-block-end to use $border-subtle-01 #17548

Merged
merged 9 commits into from
Oct 21, 2024
Merged

fix(styles): update border-block-end to use $border-subtle-01 #17548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c234031
fix(styles): update border-block-end to use $border-subtle-01
ziyadzulfikar Sep 22, 2024
4818d88
fix(styles): update border-block-end to use -subtle-02 and -subtle-03
ziyadzulfikar Sep 24, 2024
0dc55f3
Merge branch 'main' into border-subtle
ziyadzulfikar Oct 14, 2024
d6816e0
fix(styles): update border-block-end of table-expand
ziyadzulfikar Oct 16, 2024
7c4fb14
Merge branch 'main' into border-subtle
tay1orjones Oct 16, 2024
263f459
Merge branch 'main' into border-subtle
ziyadzulfikar Oct 17, 2024
d20cebe
Merge branch 'main' into border-subtle
tay1orjones Oct 17, 2024
7069f17
Merge branch 'main' into border-subtle
tay1orjones Oct 18, 2024
07d133d
Merge branch 'main' into border-subtle
tay1orjones Oct 21, 2024
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
11 changes: 10 additions & 1 deletion .all-contributorsrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1652,7 +1652,16 @@
"contributions": [
"code"
]
}
},
{
"login": "ziyadzulfikar",
"name": "ziyadzulfikar",
"avatar_url": "https://avatars.githubusercontent.com/u/56788667?v=4",
"profile": "https://github.com/ziyadzulfikar",
"contributions": [
"code"
]
},
],
"commitConvention": "none"
}
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<td align="center"><a href="https://github.com/Neues"><img src="https://avatars.githubusercontent.com/u/9409245?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah Sgorbati</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Neues" title="Code">💻</a> <a href="https://github.com/carbon-design-system/carbon/commits?author=Neues" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/divya-281"><img src="https://avatars.githubusercontent.com/u/72991264?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Divya G</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=divya-281" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/soumyaraju"><img src="https://avatars.githubusercontent.com/u/41182657?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Soumya Raju</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=soumyaraju" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/ziyadzulfikar"><img src="https://avatars.githubusercontent.com/u/56788667?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ziyad Bin Sulfi</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=ziyadzulfikar" title="Code">💻</a></td>
</tr>
</table>

Expand Down
12 changes: 11 additions & 1 deletion packages/styles/scss/components/data-table/_data-table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@

.#{$prefix}--data-table td,
.#{$prefix}--data-table tbody th {
border-block-end: 1px solid $border-subtle;
border-block-end: 1px solid $border-subtle-01;
tay1orjones marked this conversation as resolved.
Show resolved Hide resolved
border-block-start: 1px solid $layer;
color: $text-secondary;
padding-inline: $spacing-05 $spacing-05;
Expand All @@ -215,6 +215,16 @@
}
}

.#{$prefix}--layer-two .#{$prefix}--data-table td,
.#{$prefix}--layer-two .#{$prefix}--data-table tbody th {
border-block-end: 1px solid $border-subtle-02;
}

.#{$prefix}--layer-three .#{$prefix}--data-table td,
.#{$prefix}--layer-three .#{$prefix}--data-table tbody th {
border-block-end: 1px solid $border-subtle-03;
}

@supports (-moz-appearance: none) {
.#{$prefix}--data-table td {
// Fix to show borders in ff
Expand Down
10 changes: 9 additions & 1 deletion packages/styles/scss/components/data-table/expandable/_data-table-expandable.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,15 @@
// Expand icon column
//----------------------------------------------------------------------------
.#{$prefix}--data-table td.#{$prefix}--table-expand {
border-block-end: 1px solid $border-subtle;
border-block-end: 1px solid $border-subtle-01;
}

.#{$prefix}--layer-two .#{$prefix}--data-table td.#{$prefix}--table-expand {
border-block-end: 1px solid $border-subtle-02;
}

.#{$prefix}--layer-three .#{$prefix}--data-table td.#{$prefix}--table-expand {
border-block-end: 1px solid $border-subtle-03;
}

.#{$prefix}--data-table
Expand Down
Loading