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(ComponentDemo): properly theme floating components #2262

Merged
merged 6 commits into from
May 5, 2021
Merged

fix(ComponentDemo): properly theme floating components #2262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
85de3cd
fix(ComponentDemo): update table zebra stripe styles
emyarod Apr 29, 2021
a986a61
fix(ComponentDemo): update sortable table hover styles
emyarod Apr 29, 2021
158bb77
fix(ComponentDemo): update themed tooltip styles
emyarod Apr 29, 2021
0cf857e
fix(ComponentDemo): update themed date picker styles
emyarod Apr 29, 2021
5615eb9
fix(ComponentDemo): update themed overflow menu styles
emyarod Apr 29, 2021
2a63015
Merge branch 'main' into 2233-component-live-demo-theming-issue
kodiakhq[bot] May 5, 2021
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 src/components/ComponentDemo/ComponentDemo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ const ComponentDemo = ({ children, src, scope, noInline, components }) => {

const onThemeChange = (event) => {
setTheme(themes[event.selectedItem]);
document.body.dataset.livePreviewTheme = event.selectedItem;
};

const onVariantChange = (event) => {
Expand Down
84 changes: 81 additions & 3 deletions src/components/ComponentDemo/ComponentDemo.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,10 @@ fieldset.form-group:last-of-type {
}

// Themes
body[data-live-preview-theme='White'] [class^='bx--tooltip'],
body[data-live-preview-theme='White']
[class^='flatpickr-calendar'][class*='open'],
body[data-live-preview-theme='White'] ul[class^='bx--overflow-menu-options'],
.white {
@include carbon--theme(
$theme: $carbon--theme--white,
Expand All @@ -323,6 +327,10 @@ fieldset.form-group:last-of-type {
}
}

body[data-live-preview-theme='Gray 10'] [class^='bx--tooltip'],
body[data-live-preview-theme='Gray 10']
[class^='flatpickr-calendar'][class*='open'],
body[data-live-preview-theme='Gray 10'] ul[class^='bx--overflow-menu-options'],
.g10 {
@include carbon--theme(
$theme: $carbon--theme--g10,
Expand All @@ -333,6 +341,10 @@ fieldset.form-group:last-of-type {
}
}

body[data-live-preview-theme='Gray 90'] [class^='bx--tooltip'],
body[data-live-preview-theme='Gray 90']
[class^='flatpickr-calendar'][class*='open'],
body[data-live-preview-theme='Gray 90'] ul[class^='bx--overflow-menu-options'],
.g90 {
@include carbon--theme(
$theme: $carbon--theme--g90,
Expand All @@ -343,6 +355,10 @@ fieldset.form-group:last-of-type {
}
}

body[data-live-preview-theme='Gray 100'] [class^='bx--tooltip'],
body[data-live-preview-theme='Gray 100']
[class^='flatpickr-calendar'][class*='open'],
body[data-live-preview-theme='Gray 100'] ul[class^='bx--overflow-menu-options'],
.g100 {
@include carbon--theme(
$theme: $carbon--theme--g100,
Expand Down Expand Up @@ -378,20 +394,82 @@ fieldset.form-group:last-of-type {
color: var(--cds-text-01, #161616);
}

[class*='--data-table--zebra'] tbody tr:nth-child(even) td {
background-color: var(--cds-ui-03, #e0e0e0);
border-bottom: var(--cds-ui-03, #e0e0e0);
border-top: var(--cds-ui-03, #e0e0e0);
}

[class*='--data-table--zebra'] tbody tr:nth-child(odd) td {
background-color: var(--cds-ui-02, #fffff);
border-bottom: var(--cds-ui-02, #fffff);
border-top: var(--cds-ui-02, #fffff);
background-color: var(--cds-ui-01, #f4f4f4);
border-bottom: var(--cds-ui-01, #f4f4f4);
border-top: var(--cds-ui-01, #f4f4f4);
}

[class*='--content-switcher-btn'] {
height: 2.5rem;
}

[class*='--overflow-menu__icon'] {
fill: var(--cds-icon-01, #161616);
}

[class$='--overflow-menu']:hover {
background-color: var(--cds-hover-ui, #e5e5e5);
}

[class*='--overflow-menu'][class*='--overflow-menu--open'] {
background-color: var(--cds-ui-01, #f4f4f4);
}

[class*='--search--sm'],
[class*='--search--lg'],
[class*='--search--xl'],
.bx--select {
width: 50%;
}

[class*='--table-sort']:hover {
background-color: var(--cds-layer-selected-hover, #cacaca);
}
}

body {
[class$='--tooltip'] {
background-color: var(--cds-inverse-02, #393939);
}

.flatpickr-calendar.open {
background-color: var(--cds-ui-01, #ffffff);
}

[class*='--overflow-menu-options'][class*='--overflow-menu-options--open'] {
background-color: var(--cds-ui-01, #f4f4f4);

&::after {
background-color: var(--cds-ui-01, #f4f4f4);
}
}

[class$='--overflow-menu-options__option']:hover,
[class*='--overflow-menu-options__option'][class$='--overflow-menu--divider']:hover {
background-color: var(--cds-hover-ui, #e5e5e5);
}

[class$='--overflow-menu-options__option']:hover
[class*='--overflow-menu-options'] {
background-color: transparent;
}

[class*='--overflow-menu-options__btn'] {
color: var(--cds-text-02, #525252);

&:hover {
color: var(--cds-text-01, #161616);
}

&:focus {
outline: 2px solid var(--cds-focus, #0f62fe);
}
}
}