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

enhance: CMD-182 design tokens #200

Merged
merged 6 commits into from
Sep 5, 2024
Merged

enhance: CMD-182 design tokens #200

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
83c5bff
enhance: CMD-182 do not use `-rgb` css vars
wesleyboar Aug 23, 2024
ff0671d
chore: remove redundant style
wesleyboar Aug 23, 2024
9ea6f96
fix: CMD-182 do not use var in rgb
wesleyboar Aug 23, 2024
a22e5b0
fix: CMD-182 more not use var in rgb
wesleyboar Aug 23, 2024
1d40077
chore: CMD-182 flag old color vars as deprecated
wesleyboar Aug 26, 2024
7e8a3b2
fix: CMD-182 rgb relative color syntax
wesleyboar Sep 5, 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
3 changes: 1 addition & 2 deletions brainmap_cms/static/brainmap_cms/css/src/site.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
--global-color-accent--dark: hsl(229 45% 35%);
--global-color-accent--x-dark: hsl(229 45% 30%);

/* DEPRECATED */
--global-color-accent--alt: hsl(229 22% 77%);
--global-color-accent--weak: hsl(229, 45%, 52%, 0.25);

/* Link */
--global-color-link-on-light--normal: var(--global-color-accent--normal);
--global-color-link-on-dark--normal: var(--global-color-accent--x-light);
}
Expand Down
1 change: 1 addition & 0 deletions frontera_cms/static/frontera_cms/css/src/_imports/settings/color.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
--global-color-accent--dark: #64563E; /* originally #6039cc */
--global-color-accent--x-dark: #403014; /* originally #3d189b */

/* DEPRECATED */
--global-color-accent--alt: #E0D8C9; /* originally #d2cce7 */
--global-color-accent--weak: #9D702140; /* originally #6039cc40 */
}
4 changes: 2 additions & 2 deletions frontera_cms/static/frontera_cms/css/src/_imports/trumps/s-home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@
@extend %x-overlay--curtain;
}
.o-section--style-dark .s-home__banner .o-section__banner-overlay {
--color-bkgd-rgb: var(--global-color-primary--x-dark-rgb);
background-color: rgb( from design-token('color.gray.dark-x') r g b / 0.65 );
}
.o-section--style-light .s-home__banner .o-section__banner-overlay {
--color-bkgd-rgb: var(--global-color-primary--x-light-rgb);
background-color: rgb( from design-token('color.gray.light-x') r g b / 0.65 );
}


Expand Down
14 changes: 5 additions & 9 deletions utrc_cms/static/utrc_cms/css/src/_imports/trumps/s-home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,15 @@
.o-section--banner .s-home__banner .o-section__banner-overlay {
@extend %x-overlay--callout;

--color-text: inherit;
--color-bkgd-rgb: var(--global-color-primary--normal);

color: var(--color-text);
background-color: rgba(var(--color-bkgd-rgb), 0.9);
background-color: rgb( from design-token('color.gray.medium') r g b / 0.9 );
}
.o-section--banner.o-section--style-dark .s-home__banner .o-section__banner-overlay {
--color-text: var(--global-color-primary--xx-light);
--color-bkgd-rgb: var(--global-color-primary--xx-dark-rgb);
color: var(--global-color-primary--xx-light);
background-color: rgb( from design-token('color.gray.dark-2x') r g b / 0.9 );
}
.o-section--banner.o-section--style-light .s-home__banner .o-section__banner-overlay {
--color-text: var(--global-color-primary--xx-dark);
--color-bkgd-rgb: var(--global-color-primary--xx-light-rgb);
color: var(--global-color-primary--xx-dark);
background-color: rgb( from design-token('color.gray.light-2x') r g b / 0.9 );
}


Expand Down