Skip to content

Commit

Permalink
refactor: reduce scss global variables and use tokens
Browse files Browse the repository at this point in the history
  • Loading branch information
wuda-io committed Jun 4, 2024
1 parent 9e7518d commit 4e74958
Show file tree
Hide file tree
Showing 26 changed files with 219 additions and 359 deletions.
9 changes: 5 additions & 4 deletions sass/components/_badges.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.badge {
// TODO: Make better structure
:root {
--bagde-height: 22px;
}

Expand All @@ -17,8 +18,8 @@ span.badge {
&.new {
font-weight: 300;
font-size: 0.8rem;
color: $font-on-primary-color-main;
background-color: $primary-color;
color: var(--font-on-primary-color-main);
background-color: var(--md-sys-color-primary);
border-radius: 2px;
}
&.new:after {
Expand Down Expand Up @@ -47,7 +48,7 @@ nav ul a span.badge {

// Line height centering
.collection-item span.badge {
margin-top: calc(#{1.5rem * 0.5} - #{var(--bagde-height) * 0.5});
margin-top: calc(calc(1.5rem * 0.5) - calc(var(--bagde-height) * 0.5));
}

.collapsible span.badge {
Expand Down
2 changes: 1 addition & 1 deletion sass/components/_cards.scss
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
transition: color .3s ease;

&:hover {
background-color: $primary-color-hover-opaque;
background-color: var(--primary-color-hover-opaque);
}
}
}
Expand Down
14 changes: 8 additions & 6 deletions sass/components/_carousel.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.carousel {
--carousel-height: 400px;

&.carousel-slider {
top: 0;
left: 0;
Expand All @@ -18,7 +20,7 @@
.carousel-item {
width: 100%;
height: 100%;
min-height: $carousel-height;
min-height: var(--carousel-height);
position: absolute;
top: 0;
left: 0;
Expand All @@ -38,15 +40,15 @@
overflow: hidden;
position: relative;
width: 100%;
height: $carousel-height;
height: var(--carousel-height);
perspective: 500px;
transform-style: preserve-3d;
transform-origin: 0% 50%;

.carousel-item {
visibility: hidden;
width: $carousel-item-width;
height: $carousel-item-height;
width: calc(var(--carousel-height) * 0.5);
height: calc(var(--carousel-height) * 0.5);
position: absolute;
top: 0;
left: 0;
Expand All @@ -69,7 +71,7 @@

.indicator-item {
&.active {
background-color: $carousel-indicator-color-active;
background-color: var(--carousel-indicator-active-color);
}

display: inline-block;
Expand All @@ -78,7 +80,7 @@
height: 8px;
width: 8px;
margin: 24px 4px;
background-color: $carousel-indicator-color;
background-color: var(--carousel-indicator-color);

transition: background-color .3s;
border-radius: 50%;
Expand Down
19 changes: 9 additions & 10 deletions sass/components/_chips.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
--font-size-icon: 18px;
--padding: 8px;

color: $font-color-medium;
color: var(--font-color-medium);
background-color: var(--background-color-level-4dp);

display: inline-flex;
Expand All @@ -27,8 +27,8 @@

&:focus {
outline: none;
background-color: $primary-color;
color: $font-on-primary-color-main;
background-color: var(--md-sys-color-primary);
color: var(--font-on-primary-color-main);
}
}

Expand Down Expand Up @@ -75,9 +75,9 @@
flex-wrap: wrap;

border: none;
border-bottom: 1px solid $input-border-color;
border-bottom: 1px solid var(--font-color-medium);
box-shadow: none;
margin: $input-margin;
margin: 0 0 8px 0;

padding: 4px;
// min-height: 45px;
Expand All @@ -86,8 +86,8 @@
transition: all .3s;

&.focus {
border-bottom: 1px solid $primary-color;
box-shadow: 0 1px 0 0 $primary-color;
border-bottom: 1px solid var(--md-sys-color-primary);
box-shadow: 0 1px 0 0 var(--md-sys-color-primary);
}

&:hover {
Expand All @@ -97,12 +97,11 @@
input:not([type]):not(.browser-default).input {
background: none;
border: 0;
color: $input-color;
color: var(--md-sys-color-on-background);
display: inline-block;
font-size: $input-font-size;
font-size: 16px;

// height: 32px;
// height: $input-height;
// line-height: 32px;
height: 32px;

Expand Down
2 changes: 1 addition & 1 deletion sass/components/_collapsible.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@


.keyboard-focused .collapsible-header:focus {
background-color: $surface-focus-color-opaque;
background-color: var(--focus-color);
}

.collapsible-body {
Expand Down
10 changes: 5 additions & 5 deletions sass/components/_collection.scss
Original file line number Diff line number Diff line change
Expand Up @@ -64,23 +64,23 @@
}

&.active {
background-color: $primary-color;
color: $font-on-primary-color-main;
background-color: var(--md-sys-color-primary);
color: var(--font-on-primary-color-main);

.secondary-content {
color: $font-on-primary-color-main;
color: var(--font-on-primary-color-main);
}
}
}

a.collection-item {
display: block;
transition: .25s;
color: $primary-color;
color: var(--md-sys-color-primary);

&:not(.active) {
&:hover {
background-color: $surface-hover-color-opaque;
background-color: var(--hover-color);
}
}
}
Expand Down
20 changes: 10 additions & 10 deletions sass/components/_datepicker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
display: flex;
flex-direction: column;
padding: 0;
background-color: $surface-color;
background-color: var(--surface-color);
}

.datepicker-controls {
Expand Down Expand Up @@ -54,7 +54,7 @@

.month-prev > svg,
.month-next > svg {
fill: $button-flat-color;
fill: var(--font-color-medium);
}
}

Expand All @@ -70,15 +70,15 @@
.datepicker-date-display {
flex: 1 auto;
background-color: var(--primary-color);
color: $font-on-primary-color-main;
color: var(--font-on-primary-color-main);
padding: 20px 22px;
font-weight: 500;

.year-text {
display: block;
font-size: 1.5rem;
line-height: 25px;
color: $datepicker-year;
color: var(--font-on-primary-color-main);
}

.date-text {
Expand Down Expand Up @@ -115,24 +115,24 @@

abbr {
text-decoration: none;
color: $datepicker-calendar-header-color;
color: var(--font-color-medium);
}

td {
color: $datepicker-day-font-color;
color: var(--md-sys-color-on-background);

&.is-today {
color: var(--primary-color);
}

&.is-selected {
background-color: var(--primary-color);
color: $font-on-primary-color-main;
color: var(--font-on-primary-color-main);
}

&.is-outside-current-month,
&.is-disabled {
color: $datepicker-day-font-color-disabled;
color: var(--font-color-disabled);
pointer-events: none;
}

Expand All @@ -153,11 +153,11 @@
color: inherit;

&:hover {
background-color: $datepicker-day-hover;
background-color: var(--primary-color-hover-opaque);
}

&:focus {
background-color: $datepicker-day-focus;
background-color: var(--primary-color-focus-opaque);
}
}

Expand Down
4 changes: 2 additions & 2 deletions sass/components/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
}

clear: both;
color: var(--md-sys-color-on-background); //$text-color;
color: var(--md-sys-color-on-background);
cursor: pointer;
min-height: $dropdown-item-height;
line-height: 1.5rem;
Expand All @@ -58,7 +58,7 @@

body.keyboard-focused {
.dropdown-content li:focus {
background-color: $dropdown-focus-bg-color;
background-color: var(--focus-color);
}
}

Expand Down
28 changes: 14 additions & 14 deletions sass/components/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -135,19 +135,19 @@ video.responsive-video {
height: 30px;

a {
color: $font-color-medium;
color: var(--font-color-medium);
display: inline-block;
font-size: 1.2rem;
padding: 0 10px;
line-height: 30px;
}

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

&.active a {
color: $font-on-primary-color-main;
color: var(--font-on-primary-color-main);
}

&.active,
Expand All @@ -157,7 +157,7 @@ video.responsive-video {

&.disabled a {
cursor: default;
color: $font-color-disabled;
color: var(--font-color-disabled);
}

i {
Expand Down Expand Up @@ -193,7 +193,7 @@ video.responsive-video {
.breadcrumb {
display: inline-block;
font-size: 18px;
color: $font-on-primary-color-medium;
color: var(--font-on-primary-color-medium);

i,
[class^="mdi-"], [class*="mdi-"],
Expand All @@ -206,7 +206,7 @@ video.responsive-video {

&:before {
content: '\E5CC';
color: $font-on-primary-color-medium;
color: var(--font-on-primary-color-medium);
vertical-align: top;
display: inline-block;
font-family: 'Material Symbols Outlined', 'Material Symbols Rounded', 'Material Symbols Sharp', 'Material Icons';
Expand All @@ -223,7 +223,7 @@ video.responsive-video {
}

&:last-child {
color: $font-on-primary-color-main;
color: var(--font-on-primary-color-main);
}
}

Expand Down Expand Up @@ -334,11 +334,11 @@ ul.staggered-list li { opacity: 0; }
// Footer
.page-footer {
padding-top: 20px;
color: $footer-font-color;
background-color: $footer-bg-color;
color: var(--font-on-primary-color-main);
background-color: var(--md-sys-color-primary);

a {
color: $footer-font-color;
color: var(--font-on-primary-color-main);
}

.footer-copyright,
Expand All @@ -349,8 +349,8 @@ ul.staggered-list li { opacity: 0; }
align-items: center;
justify-content: space-between;
padding: 10px 0px;
color: $footer-copyright-font-color;
background-color: $footer-copyright-bg-color;
color: var(--font-on-primary-color-dark-medium);
background-color: var(--primary-color-dark);
}
}

Expand Down Expand Up @@ -383,12 +383,12 @@ table {
transition: background-color .25s ease;

&:hover {
background-color: $surface-hover-color-opaque;
background-color: var(--hover-color);
}
}

thead {
color: $font-color-medium;
color: var(--font-color-medium);
}

&.centered {
Expand Down
Loading

0 comments on commit 4e74958

Please sign in to comment.