Skip to content

💥 use css variables for design system colors #580

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

Open
cprodhomme wants to merge 2 commits into
base: main
Choose a base branch
from
Open

💥 use css variables for design system colors #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72cc8ae
💥 use css variables for design system colors
cprodhomme Apr 5, 2024
698f991
Merge branch 'main' into captive-theme/extract-design-system-colors
cprodhomme Apr 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
4 changes: 2 additions & 2 deletions captive-admin/app/assets/stylesheets/captive-admin/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
@import 'inputs/select2';

body {
color: $fg-default;
color: var(--fg-default);
@include body-medium;
}
}
Expand All @@ -34,7 +34,7 @@
margin-top: $spacer-1;
@include body-small;

color: $fg-subtle;
color: var(--fg-subtle);
}

.col-actions {
Expand Down
4 changes: 2 additions & 2 deletions captive-admin/app/assets/stylesheets/captive-admin/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ form {
margin: 0;

&.inputs {
background-color: $bg-subtle;
background-color: var(--bg-subtle);
box-shadow: none;
border-radius: 0;
}
Expand Down Expand Up @@ -45,7 +45,7 @@ form {
margin-bottom: $spacer-1;

abbr {
color: $primary-fg;
color: var(--primary-fg);
padding-left: $spacer-1;

&[title] {
Expand Down
14 changes: 7 additions & 7 deletions captive-admin/app/assets/stylesheets/captive-admin/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

#header {
text-shadow: none;
background: $bg-emphasis;
background: var(--bg-emphasis);
padding: 0 $spacer-6;

h1 {
color: $fg-on-emphasis;
color: var(--fg-on-emphasis);
padding-left: 0;
height: 60px;
display: flex;
Expand Down Expand Up @@ -48,7 +48,7 @@

&::before {
content: '';
background-color: $primary-emphasis;
background-color: var(--primary-emphasis);
position: absolute;
bottom: 0;
width: 19px;
Expand Down Expand Up @@ -90,20 +90,20 @@
ul {
@include rounded-all(12px, 12px, 12px, 12px);

background: $bg-default;
background: var(--bg-default);
text-align: left;
box-shadow: $shadow-m;
min-width: $spacer-11;

li {
a {
color: $fg-default;
color: var(--fg-default);
padding-top: $spacer-3;
padding-bottom: $spacer-3;

&:hover {
background: $bg-subtle;
color: $fg-default;
background: var(--bg-subtle);
color: var(--fg-default);
border-radius: 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion captive-admin/app/assets/stylesheets/captive-admin/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ h5,
h6 {
@include title-family;

color: $fg-default;
color: var(--fg-default);
letter-spacing: 0.5px;
margin-top: 0;
}
Expand Down
4 changes: 2 additions & 2 deletions captive-admin/app/assets/stylesheets/captive-admin/components/_breadcrumbs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
a:link,
a:visited,
a:active {
color: $fg-subtle;
color: var(--fg-subtle);
}

.breadcrumb_sep {
color: $primary-fg;
color: var(--primary-fg);
font-weight: bold;
}
}
4 changes: 2 additions & 2 deletions captive-admin/app/assets/stylesheets/captive-admin/components/_dropdown_menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
&:hover {
background-image: none;
text-shadow: none;
background-color: $bg-subtle;
color: $fg-default;
background-color: var(--bg-subtle);
color: var(--fg-default);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions captive-admin/app/assets/stylesheets/captive-admin/components/_pagination.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.pagination_information {
color: $fg-subtle;
color: var(--fg-subtle);

b {
color: $fg-default;
color: var(--fg-default);
}
}
2 changes: 1 addition & 1 deletion captive-admin/app/assets/stylesheets/captive-admin/components/_panels.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
}

.panel {
background: $bg-subtle;
background: var(--bg-subtle);
}

// ----------------------------------- Sidebar Sections
Expand Down
2 changes: 1 addition & 1 deletion captive-admin/app/assets/stylesheets/captive-admin/components/_scopes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.scopes {
li {
.count {
color: $fg-default;
color: var(--fg-default);
}

&:first-child a {
Expand Down
8 changes: 4 additions & 4 deletions captive-admin/app/assets/stylesheets/captive-admin/components/_status_tags.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
padding: $spacer-2 $spacer-3;

&.yes {
background: $success-subtle;
color: $success-fg;
background: var(--success-subtle);
color: var(--success-fg);
}

&.no {
background: $bg-subtle;
color: $fg-muted;
background: var(--bg-subtle);
color: var(--fg-muted);
}
}
6 changes: 3 additions & 3 deletions captive-admin/app/assets/stylesheets/captive-admin/components/_table_tools.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ a.table_tools_button,
box-shadow: none;
background: none;
border-color: $border-color-emphasis;
color: $fg-default;
color: var(--fg-default);
}
}
}
Expand All @@ -48,12 +48,12 @@ a.table_tools_button,
}

&.selected a {
background: $bg-subtle;
background: var(--bg-subtle);
box-shadow: none;
border: 2px solid $border-color-emphasis;

&:hover {
background: $bg-subtle;
background: var(--bg-subtle);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions captive-admin/app/assets/stylesheets/captive-admin/components/_tables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ table.index_table {

th {
padding: $spacer-4;
color: $fg-subtle;
color: var(--fg-subtle);
background: transparent;

a,
a:link,
a:visited {
color: $fg-subtle;
color: var(--fg-subtle);
}

&.sorted-asc,
&.sorted-desc {
background: transparent;

a {
color: $fg-default;
color: var(--fg-default);
}
}

Expand Down
20 changes: 10 additions & 10 deletions captive-admin/app/assets/stylesheets/captive-admin/mixins/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
box-shadow: $shadow-xs;
}
@mixin primary-button {
background-color: $primary-emphasis;
background-color: var(--primary-emphasis);
background-image: none;
color: $primary-on-emphasis;
color: var(--primary-on-emphasis);
border: none;
text-shadow: none;
box-shadow: $shadow-s;
Expand All @@ -34,7 +34,7 @@

&:not(.disabled) {
&:hover {
background-color: $primary-muted;
background-color: var(--primary-muted);
background-image: none;
}

Expand All @@ -50,17 +50,17 @@
@include basic-button;

outline: solid 1px;
color: $fg-muted;
background-color: $bg-subtle;
color: var(--fg-muted);
background-color: var(--bg-subtle);

&:not(.disabled) {
&:hover {
background-color: $bg-default;
background-color: var(--bg-default);
}

&:active {
background-color: $bg-emphasis;
color: $fg-on-emphasis;
background-color: var(--bg-emphasis);
color: var(--fg-on-emphasis);
}
}
}
Expand All @@ -70,7 +70,7 @@

&:not(.disabled) {
&:hover {
background-color: $bg-subtle;
background-color: var(--bg-subtle);
}
}
}
Expand All @@ -80,7 +80,7 @@
box-shadow: none;
text-decoration: underline;
padding-left: 0;
color: $fg-muted;
color: var(--fg-muted);
background: transparent;

&:hover {
Expand Down
6 changes: 3 additions & 3 deletions captive-admin/app/assets/stylesheets/captive-admin/mixins/_sections.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

// Fin héritage AA
padding: $spacer-2 $spacer-4;
color: $fg-muted;
background: $bg-default;
color: var(--fg-muted);
background: var(--bg-default);
border-bottom: 1px solid $border-color;
}

@mixin section-background {
background: $bg-default;
background: var(--bg-default);
border-radius: 0;
overflow: hidden;
}
Expand Down
4 changes: 2 additions & 2 deletions captive-admin/app/assets/stylesheets/captive-admin/mixins/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'captive-theme/variables';

$menu-arrow-light-icon-url: 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgY2xhc3M9InctOCBtci00IGljb24tY2hldmVyb24tZG93biI+PHBhdGggY2xhc3M9InNlY29uZGFyeSIgZmlsbD0iI2ZmZmZmZiIgZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMTUuMyAxMC4zYTEgMSAwIDAgMSAxLjQgMS40bC00IDRhMSAxIDAgMCAxLTEuNCAwbC00LTRhMSAxIDAgMCAxIDEuNC0xLjRsMy4zIDMuMjkgMy4zLTMuM3oiPjwvcGF0aD48L3N2Zz4=';
$error-color: $danger-fg;
$form-label-color: $fg-muted;
$error-color: var(--danger-fg);
$form-label-color: var(--fg-muted);
6 changes: 3 additions & 3 deletions captive-admin/app/assets/stylesheets/captive-admin/pages/_logged_out.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
body.logged_out {
background: $bg-subtle;
background: var(--bg-subtle);

#content_wrapper {
width: 450px;
margin: $spacer-10 auto;

#active_admin_content {
background: $bg-default;
background: var(--bg-default);
box-shadow: $shadow-m;
border-radius: $border-radius-s;
padding: $spacer-6;
Expand All @@ -19,7 +19,7 @@ body.logged_out {
text-shadow: none;
text-align: center;
box-shadow: none;
color: $fg-default;
color: var(--fg-default);
@include title-large;

margin: 0;
Expand Down
2 changes: 1 addition & 1 deletion captive-admin/app/assets/stylesheets/captive-admin/structure/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#footer {
background: $bg-default;
background: var(--bg-default);
padding: $spacer-4 $spacer-6;
@include body-medium;

Expand Down
2 changes: 1 addition & 1 deletion captive-admin/app/assets/stylesheets/captive-admin/structure/_main_structure.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#main_content_wrapper {
#main_content {
padding: $spacer-4 $spacer-6;
background: $bg-subtle;
background: var(--bg-subtle);
margin-right: 0;
}
}
Expand Down
51 changes: 51 additions & 0 deletions captive-theme/app/assets/stylesheets/captive-theme/_design_system_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// Couleurs du Design System Captive
// https://www.notion.so/captive/UI-Les-couleurs-du-design-system-Captive-eed4bbb0295f4d949c47e183033e5180

:root {
// foreground
--fg-default: var(--blue-grey-900);
--fg-muted: var(--blue-grey-600);
--fg-subtle: var(--blue-grey-500);
--fg-on-emphasis: var(--white);

// background
--bg-default: var(--white);
--bg-subtle: var(--blue-grey-050);
--bg-emphasis: var(--blue-grey-900);

// primary
--primary-fg: var(--pink-vivid-500);
--primary-emphasis: var(--pink-vivid-500);
--primary-muted: var(--pink-vivid-400);
--primary-subtle: var(--pink-vivid-050);

// accent
--accent-fg: var(--light-blue-vivid-700);
--accent-emphasis: var(--light-blue-vivid-700);
--accent-muted: var(--light-blue-vivid-600);
--accent-subtle: var(--light-blue-vivid-050);

// success
--success-fg: var(--lime-green-700);
--success-emphasis: var(--lime-green-700);
--success-muted: var(--lime-green-600);
--success-subtle: var(--lime-green-050);

// attention
--attention-fg: var(--yellow-vivid-800);
--attention-emphasis: var(--yellow-vivid-800);
--attention-muted: var(--yellow-vivid-700);
--attention-subtle: var(--yellow-vivid-050);

// danger
--danger-fg: var(--red-vivid-600);
--danger-emphasis: var(--red-vivid-600);
--danger-muted: var(--red-vivid-500);
--danger-subtle: var(--red-vivid-050);

// support
--support-fg: var(--purple-700);
--support-emphasis: var(--purple-700);
--support-muted: var(--purple-500);
--support-subtle: var(--purple-050);
}
Loading