Skip to content

Commit

Permalink
Merge branch 'master' into jmainguy/feat/CDM-261/add_code_in_DS
Browse files Browse the repository at this point in the history
  • Loading branch information
jmainguytalend authored Jul 24, 2023
2 parents d1af817 + c15088d commit 5d9bff1
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 11 deletions.
5 changes: 5 additions & 0 deletions .changeset/hungry-parrots-mate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@talend/react-components': minor
---

TDOPS-4856 - Fix List colors taken from DS tokens
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ $tc-toolbar-height: 7rem;
padding-right: $padding-larger;

background: tokens.$coral-color-neutral-background-medium;
border-top: tokens.$coral-border-s-solid tokens.$coral-color-neutral-border;
border-bottom: tokens.$coral-border-s-solid tokens.$coral-color-neutral-border;
border-top: tokens.$coral-border-s-solid tokens.$coral-color-neutral-border-weak;
border-bottom: tokens.$coral-border-s-solid tokens.$coral-color-neutral-border-weak;
margin-bottom: 0;
flex-shrink: 0;
flex-grow: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ $tc-height: 4rem;
min-height: $tc-height;

&-select-all {
border-bottom: $tc-popover-border-width solid tokens.$coral-color-neutral-border;
border-bottom: $tc-popover-border-width solid tokens.$coral-color-neutral-border-weak;
}

&:global(.ally-focus-within),
Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/List/Toolbar/Toolbar.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ $tc-list-toolbar-height: 7rem !default;

.tc-list-toolbar {
background: tokens.$coral-color-neutral-background-medium;
border-top: tokens.$coral-border-s-solid tokens.$coral-color-neutral-border;
border-bottom: tokens.$coral-border-s-solid tokens.$coral-color-neutral-border;
border-top: tokens.$coral-border-s-solid tokens.$coral-color-neutral-border-weak;
border-bottom: tokens.$coral-border-s-solid tokens.$coral-color-neutral-border-weak;
margin-bottom: 0;
padding: 0 $padding-larger;

Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/Rich/Layout/RichLayout.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
@use '~@talend/design-tokens/lib/tokens';

$tc-popover-border-width: 0.1rem !default;
$tc-popover-border-color: tokens.$coral-color-neutral-border !default;
$tc-popover-border-color: tokens.$coral-color-neutral-border-weak !default;
$tc-popover-box-shadow: 0 0.1rem 0.3rem 0 rgba(0, 0, 0, 0.2) !default;
$tc-popover-body-min-height: 10rem !default;
$tc-popover-body-max-height: 30rem !default;
$tc-popover-max-width: 40rem !default;
$tc-popover-header-border-color: tokens.$coral-color-neutral-border !default;
$tc-popover-header-border-color: tokens.$coral-color-neutral-border-weak !default;
$tc-popover-header-footer-height: 7rem !default;

:global(.popover) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ $tc-list-table-cell-padding: $padding-small !default;
background-color: tokens.$coral-color-neutral-background;

.row {
border-bottom: tokens.$coral-border-s-solid tokens.$coral-color-neutral-border;
border-bottom: tokens.$coral-border-s-solid tokens.$coral-color-neutral-border-weak;
background: tokens.$coral-color-neutral-background;
display: flex;
align-items: center;
Expand All @@ -25,7 +25,7 @@ $tc-list-table-cell-padding: $padding-small !default;
background-color: tokens.$coral-color-neutral-background-medium;

.cell {
border-right: 1px solid tokens.$coral-color-neutral-border;
border-right: 1px solid tokens.$coral-color-neutral-border-weak;
}
}
}
Expand Down Expand Up @@ -65,7 +65,7 @@ $tc-list-table-cell-padding: $padding-small !default;
box-shadow: $shadow-default;

.cell {
border-right: tokens.$coral-border-s-solid tokens.$coral-color-neutral-border;
border-right: tokens.$coral-border-s-solid tokens.$coral-color-neutral-border-weak;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

.inner-box {
background: tokens.$coral-color-neutral-background;
border: 1px solid tokens.$coral-color-neutral-border;
border: 1px solid tokens.$coral-color-neutral-border-weak;
border-radius: 3px;
height: 100%;

Expand Down

0 comments on commit 5d9bff1

Please sign in to comment.