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

Updated all color-interactive-neutral tokens and CSS variables #44

Merged
merged 1 commit into from
Jul 14, 2023
Merged

Updated all color-interactive-neutral tokens and CSS variables #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/vanilla/src/sass/components/_badges-chips-tags.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
width: fit-content;
padding: 0 0 0 var(--cbp-space-3x);
color: var(--cbp-color-text-lightest);
background-color: var(--cbp-color-interactive-neutral-base); // --cbp-color-interactive-secondary-dark does not exist
background-color: var(--cbp-color-interactive-secondary-base); // --cbp-color-interactive-secondary-dark does not exist
border-width: 0;
border-radius: var(--cbp-border-radius-pill);
text-transform: uppercase;
Expand Down
28 changes: 14 additions & 14 deletions packages/vanilla/src/sass/components/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.cbp-dropdown__custom {
align-items: center;
background-color: transparent;
border: 1px solid var(--cbp-color-interactive-neutral-base);
border: 1px solid var(--cbp-color-interactive-secondary-base);
border-radius: 3px;
border-right: 0;
cursor: inherit;
Expand All @@ -22,12 +22,12 @@
width: 100%;

&:hover {
border: 2px solid var(--cbp-color-interactive-neutral-darker);
border: 2px solid var(--cbp-color-interactive-secondary-darker);
border-right: 0;
}

&:hover::after {
background-color: var(--cbp-color-interactive-neutral-darker);
background-color: var(--cbp-color-interactive-secondary-darker);
// border: 2px solid $cbp-ui-neutral-darker;
}

Expand All @@ -44,12 +44,12 @@
}

&:hover {
border: 2px solid var(--cbp-color-interactive-neutral-darker);
border: 2px solid var(--cbp-color-interactive-secondary-darker);
border-right: 0;
}

&:disabled:hover::after {
background-color: var(--cbp-color-interactive-neutral-darker);
background-color: var(--cbp-color-interactive-secondary-darker);
// border: 2px solid $cbp-ui-neutral-darker;
}
}
Expand All @@ -64,7 +64,7 @@
/* Down Caret */
.cbp-dropdown__custom::after {
align-items: center;
background-color: var(--cbp-color-interactive-neutral-base);
background-color: var(--cbp-color-interactive-secondary-base);
// border: 2px solid $cbp-ui-neutral-base;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
Expand Down Expand Up @@ -97,7 +97,7 @@
/* Dropdown Menu */
.cbp-dropdown {
background-color: var(--cbp-color-white);
border: 1px solid var(--cbp-color-interactive-neutral-base);
border: 1px solid var(--cbp-color-interactive-secondary-base);
border-top-left-radius: 0px;
border-top-right-radius: 0px;
border-bottom-left-radius: 3px;
Expand Down Expand Up @@ -126,13 +126,13 @@
text-decoration: none;

&:hover:not([disabled]) {
background-color: var(--cbp-color-interactive-neutral-darker);
background-color: var(--cbp-color-interactive-secondary-darker);
color: var(--cbp-color-text-lightest);
cursor: pointer;
font-weight: 700;

&::after {
border-bottom: 1px solid var(--cbp-color-interactive-neutral-darker);
border-bottom: 1px solid var(--cbp-color-interactive-secondary-darker);
}
}

Expand All @@ -145,14 +145,14 @@
&::after {
content: "";
display: none;
border-bottom: 1px solid var(--cbp-color-interactive-neutral-darker);
border-bottom: 1px solid var(--cbp-color-interactive-secondary-darker);
}
}

/* Hacky solution due to width property (right margin) of separating line */
&::after {
content: "";
border-bottom: 1px solid var(--cbp-color-interactive-neutral-lighter);
border-bottom: 1px solid var(--cbp-color-interactive-secondary-lighter);
display: block;
height: 1px;
left: 12px;
Expand Down Expand Up @@ -185,7 +185,7 @@

&:hover:not([disabled]) {
background-color: inherit;
border-color: var(--cbp-color-interactive-neutral-lighter);
border-color: var(--cbp-color-interactive-secondary-lighter);
box-shadow: initial;
clip-path: initial;
}
Expand All @@ -205,7 +205,7 @@
}

&:focus {
border: 2px solid var(--cbp-color-interactive-neutral-lighter);
border: 2px solid var(--cbp-color-interactive-secondary-lighter);
box-shadow: initial;
clip-path: initial;
outline: 0 !important; // Overriding style from _focus.scss??
Expand All @@ -220,7 +220,7 @@
/* Hacky solution due to width property (right margin) of separating line */
&::after {
content: "";
border-bottom: 1px solid var(--cbp-color-interactive-neutral-lighter);
border-bottom: 1px solid var(--cbp-color-interactive-secondary-lighter);
display: block;
height: 1px;
left: 12px;
Expand Down
22 changes: 11 additions & 11 deletions packages/vanilla/src/sass/components/_fileinput.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
position: relative;

background-color: transparent;
border: var(--cbp-border-size-md) dashed var(--cbp-color-interactive-neutral-base);
border: var(--cbp-border-size-md) dashed var(--cbp-color-interactive-secondary-base);
border-radius: var(--cbp-border-radius-soft);
cursor: pointer;

Expand Down Expand Up @@ -54,12 +54,12 @@
}

&:hover {
border: var(--cbp-border-size-md) dashed var(--cbp-color-interactive-neutral-darker);
outline: var(--cbp-border-size-xl) solid var(--cbp-color-interactive-neutral-light);
border: var(--cbp-border-size-md) dashed var(--cbp-color-interactive-secondary-darker);
outline: var(--cbp-border-size-xl) solid var(--cbp-color-interactive-secondary-light);
outline-offset: calc(-1 * var(--cbp-space-3x) / 2);

& > .cbp-btn__secondary {
background-color: var(--cbp-color-interactive-neutral-darker);
background-color: var(--cbp-color-interactive-secondary-darker);
}
}

Expand Down Expand Up @@ -137,7 +137,7 @@
width: var(--cbp-space-7x);

& > i {
color: var(--cbp-color-interactive-neutral-dark);
color: var(--cbp-color-interactive-secondary-dark);
vertical-align: middle;
}

Expand Down Expand Up @@ -173,16 +173,16 @@
}

&:hover {
background-color: var(--cbp-color-interactive-neutral-darker);
background-color: var(--cbp-color-interactive-secondary-darker);

& > i {
color: var(--cbp-color-interactive-neutral-lighter);
color: var(--cbp-color-interactive-secondary-lighter);
}
}

&:focus {
& > i {
color: var(--cbp-color-interactive-neutral-lighter);
color: var(--cbp-color-interactive-secondary-lighter);
}
}
}
Expand Down Expand Up @@ -231,17 +231,17 @@
}

&:hover {
background-color: var(--cbp-color-interactive-neutral-darker);
background-color: var(--cbp-color-interactive-secondary-darker);

& > i {
color: var(--cbp-color-interactive-neutral-lighter);
color: var(--cbp-color-interactive-secondary-lighter);
}
}

&:focus {

& > i {
color: var(--cbp-color-interactive-neutral-lighter);
color: var(--cbp-color-interactive-secondary-lighter);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/vanilla/src/sass/components/_menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}

&:hover:not(:focus) {
background-color: var(--cbp-color-interactive-neutral-light);
background-color: var(--cbp-color-interactive-secondary-light);
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/vanilla/src/sass/components/_toggle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
}

&:disabled:hover + .slider {
background-color: var(--cbp-color-interactive-neutral-dark);
background-color: var(--cbp-color-interactive-secondary-dark);
}

&:disabled:focus + .slider {
Expand All @@ -78,7 +78,7 @@
left: 0;
right: 0;
bottom: 0;
background-color: var(--cbp-color-interactive-neutral-light);
background-color: var(--cbp-color-interactive-secondary-light);
border-radius: var(--cbp-border-radius-pill);
cursor: pointer;

Expand All @@ -97,7 +97,7 @@
}

&:hover {
background-color: var(--cbp-color-interactive-neutral-dark);
background-color: var(--cbp-color-interactive-secondary-dark);

&::before {
background-color: transparent;
Expand Down
4 changes: 2 additions & 2 deletions packages/vanilla/src/sass/components/accordion/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
.cbp-accordion__control {
display: flex;
align-items: center;
background: var(--cbp-color-interactive-neutral-lighter);
background: var(--cbp-color-interactive-secondary-lighter);
border: none;
color: var(--cbp-color-text-darkest);
justify-content: space-between;
Expand All @@ -32,7 +32,7 @@
}

&:hover {
background-color: var(--cbp-color-interactive-neutral-light);
background-color: var(--cbp-color-interactive-secondary-light);
}

&:focus {
Expand Down
4 changes: 2 additions & 2 deletions packages/vanilla/src/sass/components/banner/_usa.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
.cbp-banner__toggle {
background-color: transparent;
border: 0;
color: var(--cbp-color-interactive-neutral-light);
color: var(--cbp-color-interactive-secondary-light);
padding: 0;
text-decoration: underline;

Expand All @@ -45,7 +45,7 @@
}

&:hover {
color: var(--cbp-color-interactive-neutral-lighter);
color: var(--cbp-color-interactive-secondary-lighter);
}

&:focus {
Expand Down
Loading