Skip to content

Commit

Permalink
fix(styles): update border-block-end to use $border-subtle-01 (#17548)
Browse files Browse the repository at this point in the history
* fix(styles): update border-block-end to use $border-subtle-01

* fix(styles): update border-block-end to use -subtle-02 and -subtle-03

* fix(styles): update border-block-end of table-expand

---------

Co-authored-by: Taylor Jones <[email protected]>
  • Loading branch information
ziyadzulfikar and tay1orjones authored Oct 21, 2024
1 parent 203c3b9 commit e667c88
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 3 deletions.
11 changes: 10 additions & 1 deletion .all-contributorsrc
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
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
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;
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
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

0 comments on commit e667c88

Please sign in to comment.