Skip to content

[DRAFT] added prototype styling for dark theme support #113

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

Closed
wants to merge 2 commits into from
Closed

[DRAFT] added prototype styling for dark theme support #113

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
dfb85f5
#77 added prototype styling for dark theme support
bugy Apr 25, 2021
4dff075
#77 fixed dropdown caret color in dark mode
bugy Apr 28, 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 sass/_style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ body {
line-height: 1.6;
font-size: 16px;
-webkit-font-smoothing: antialiased;
background-color: var(--surface-color);
}

p.box {
Expand Down
1 change: 1 addition & 0 deletions sass/components/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ button.btn-floating {
&:focus,
&:hover {
box-shadow: none;
background-color: $button-flat-hover-background-color;
}
&:focus {
background-color: rgba(0, 0, 0, .1);
Expand Down
2 changes: 1 addition & 1 deletion sass/components/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

body.keyboard-focused {
.dropdown-content li:focus {
background-color: darken($dropdown-hover-bg-color, 8%);
background-color: $dropdown-focus-bg-color;
}
}

Expand Down
2 changes: 1 addition & 1 deletion sass/components/_global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ a {
.divider {
height: 1px;
overflow: hidden;
background-color: color("grey", "lighten-2");
background-color: $divider-color;
}


Expand Down
8 changes: 4 additions & 4 deletions sass/components/_sidenav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
float: none;
line-height: $sidenav-line-height;

&.active { background-color: rgba(0,0,0,.05); }
&.active { background-color: $button-flat-focus-background-color; }
}

li > a {
Expand All @@ -45,7 +45,7 @@
line-height: $sidenav-line-height;
padding: 0 ($sidenav-padding * 2);

&:hover { background-color: rgba(0,0,0,.05);}
&:hover { background-color: $button-flat-hover-background-color;}

&.btn, &.btn-large, &.btn-flat, &.btn-floating {
margin: 10px 15px;
Expand All @@ -68,7 +68,7 @@
line-height: $sidenav-line-height;
margin: 0 ($sidenav-padding * 2) 0 0;
width: $sidenav-item-height / 2;
color: rgba(0,0,0,.54);
color: $sidenav-icon-color;
}
}

Expand All @@ -84,7 +84,7 @@

cursor: initial;
pointer-events: none;
color: rgba(0,0,0,.54);
color: $sidenav-subheader-color;
font-size: $sidenav-font-size;
font-weight: 500;
line-height: $sidenav-line-height;
Expand Down
15 changes: 9 additions & 6 deletions sass/components/_tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,19 @@
a {
&:focus,
&:focus.active {
background-color: transparentize($tabs-underline-color, .8);
background-color: $tabs-focus-bg-color;
outline: none;
}

&:hover,
&.active {
background-color: transparent;
color: $tabs-text-color;
color: $tabs-active-text-color;
}

color: rgba($tabs-text-color, .7);
&:hover {
background-color: $tabs-hover-bg-color;
}

color: $tabs-text-color;
display: block;
width: 100%;
height: 100%;
Expand All @@ -70,8 +72,9 @@

&.disabled a,
&.disabled a:hover {
color: rgba($tabs-text-color, .4);
color: $tabs-disabled-text-color;
cursor: default;
background-color: transparent;
}
}
.indicator {
Expand Down
41 changes: 41 additions & 0 deletions sass/components/_theme_variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
:root {
--surface-color: #ffffff;
--background-color: #ffffff;

--font-color-main: rgba(0, 0, 0, 0.87);
--font-color-medium: rgba(0, 0, 0, 0.56);
--font-color-disabled: rgba(0, 0, 0, 0.38);

--hover-color: rgba(0, 0, 0, 0.04);
--focus-color: rgba(0, 0, 0, 0.12);
--focus-color-solid: #E0E0E0;

--background-color-disabled: rgba(0, 0, 0, 0.12);
--background-color-level-4dp: rgba(0, 0, 0, 0.09);

--separator-color: #DDDDDD; /* borders between components */

--slider-track-color: rgba(0, 0, 0, 0.32);
--switch-thumb-off-color: #ffffff;
}

:root[theme='dark'] {
--surface-color: #121212;
--background-color: #242424;

--font-color-main: rgba(255, 255, 255, 0.87);
--font-color-medium: rgba(255, 255, 255, 0.60);
--font-color-disabled: rgba(255, 255, 255, 0.38);

--hover-color: rgba(255, 255, 255, 0.04);
--focus-color: rgba(255, 255, 255, 0.12);
--focus-color-solid: #424242;

--background-color-disabled: rgba(255, 255, 255, 0.12);
--background-color-level-4dp: rgba(255, 255, 255, 0.09);

--separator-color: #424242; /* borders between components */

--slider-track-color: rgba(255, 255, 255, 0.32);
--switch-thumb-off-color: #bababa;
}
3 changes: 2 additions & 1 deletion sass/components/_timepicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@

/* Analog Clock Display */
.timepicker-analog-display {
flex: 2.5 auto;
flex: 2.5 auto;
background-color: $timepicker-clock-bg;
}

.timepicker-plate {
Expand Down
76 changes: 51 additions & 25 deletions sass/components/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,16 @@ $success-color: color("green", "base") !default;
$error-color: color("red", "base") !default;
$link-color: color("light-blue", "darken-1") !default;

$bg-color: var(--background-color) !default;
$bg-hover-color-opaque: var(--hover-color) !default;
$bg-focus-color-opaque: var(--focus-color) !default;

$secondary-color-when-hovered-solid: lighten($secondary-color, 4%) !default;
$secondary-color-when-focused-solid: lighten($secondary-color, 12%) !default;
$secondary-color-hover-opaque: rgba($secondary-color, 0.08) !default;
$secondary-color-focus-opaque: rgba($secondary-color, 0.24) !default;

$divider-color: var(--separator-color);
// 2. Badges
// ==========================================================================

Expand All @@ -64,8 +73,8 @@ $button-padding: 0 16px !default;
$button-radius: 2px !default;

// Disabled styles
$button-disabled-background: #DFDFDF !default;
$button-disabled-color: #9F9F9F !default;
$button-disabled-background: var(--background-color-disabled) !default;
$button-disabled-color: var(--font-color-disabled) !default;

// Raised buttons
$button-raised-background: $secondary-color !default;
Expand All @@ -85,8 +94,10 @@ $button-small-height: $button-height * .9 !default;
$button-floating-small-size: $button-height * .9 !default;

// Flat buttons
$button-flat-color: #343434 !default;
$button-flat-disabled-color: lighten(#999, 10%) !default;
$button-flat-color: var(--font-color-medium) !default;
$button-flat-hover-background-color: var(--hover-color) !default;
$button-flat-focus-background-color: var(--focus-color) !default;
$button-flat-disabled-color: var(--font-color-disabled) !default;

// Floating buttons
$button-floating-background: $secondary-color !default;
Expand Down Expand Up @@ -146,15 +157,17 @@ $datepicker-selected-outfocus: desaturate(lighten($secondary-color, 35%), 15%) !
$datepicker-day-focus: transparentize(desaturate($secondary-color, 5%), .75) !default;
$datepicker-disabled-day-color: rgba(0, 0, 0, .3) !default;

$timepicker-clock-color: rgba(0, 0, 0, .87) !default;
$timepicker-clock-plate-bg: #eee !default;
$timepicker-clock-bg: $bg-color !default;
$timepicker-clock-color: var(--font-color-main) !default;
$timepicker-clock-plate-bg: var(--background-color-level-4dp) !default;


// 9. Dropdown
// ==========================================================================

$dropdown-bg-color: #fff !default;
$dropdown-hover-bg-color: #eee !default;
$dropdown-bg-color: $bg-color !default;
$dropdown-hover-bg-color: $bg-hover-color-opaque !default;
$dropdown-focus-bg-color: $bg-focus-color-opaque !default;
$dropdown-color: $secondary-color !default;
$dropdown-item-height: 50px !default;

Expand All @@ -164,7 +177,8 @@ $dropdown-item-height: 50px !default;

// Text Inputs + Textarea
$input-height: 3rem !default;
$input-border-color: color("grey", "base") !default;
$input-border-color: var(--font-color-medium) !default;
$input-color: var(--font-color-main) !default;
$input-border: 1px solid $input-border-color !default;
$input-background: #fff !default;
$input-error-color: $error-color !default;
Expand All @@ -180,7 +194,7 @@ $input-disabled-solid-color: #949494 !default;
$input-disabled-border: 1px dotted $input-disabled-color !default;
$input-invalid-border: 1px solid $input-error-color !default;
$input-icon-size: 2rem;
$placeholder-text-color: lighten($input-border-color, 20%) !default;
$placeholder-text-color: var(--font-color-medium) !default;

// Radio Buttons
$radio-fill-color: $secondary-color !default;
Expand All @@ -191,23 +205,29 @@ $radio-border: 2px solid $radio-fill-color !default;
$range-height: 14px !default;
$range-width: 14px !default;
$track-height: 3px !default;
$range-track-color: var(--slider-track-color) !default;

// Select
$select-border: 1px solid #f2f2f2 !default;
$select-background: rgba(255, 255, 255, 0.90) !default;
$select-background: $bg-color !default;
$select-focus: 1px solid lighten($secondary-color, 47%) !default;
$select-option-hover: rgba(0,0,0,.08) !default;
$select-option-focus: rgba(0,0,0,.08) !default;
$select-option-selected: rgba(0,0,0,.03) !default;
$select-option-hover: $bg-hover-color-opaque !default;
$select-option-focus: $bg-focus-color-opaque !default;
$select-option-selected: $bg-focus-color-opaque !default;
$select-padding: 5px !default;
$select-radius: 2px !default;
$select-disabled-color: rgba(0,0,0,.3) !default;
$select-disabled-color: var(--font-color-disabled) !default;
$select-input-color: var(--font-color-main) !default;

// Switches
$switch-bg-color: $secondary-color !default;
$switch-checked-lever-bg: desaturate(lighten($switch-bg-color, 25%), 25%) !default;
$switch-unchecked-bg: #F1F1F1 !default;
$switch-unchecked-lever-bg: rgba(0,0,0,.38) !default;
$switch-thumb-checked-color: $secondary-color !default;
$switch-thumb-unchecked-color: var(--switch-thumb-off-color) !default;
$switch-track-unchecked-bg: var(--slider-track-color) !default;
$switch-track-checked-bg: rgba($secondary-color, 0.32) !default;
$switch-reaction-checked-focus-color: $secondary-color-focus-opaque !default;
$switch-reaction-unchecked-focus-color: $bg-focus-color-opaque !default;
$switch-reaction-checked-hover-color: $secondary-color-hover-opaque !default;
$switch-reaction-unchecked-hover-color: $bg-hover-color-opaque !default;
$switch-radius: 15px !default;


Expand Down Expand Up @@ -255,8 +275,10 @@ $navbar-brand-font-size: 2.1rem !default;

$sidenav-width: 300px !default;
$sidenav-font-size: 14px !default;
$sidenav-font-color: rgba(0,0,0,.87) !default;
$sidenav-bg-color: #fff !default;
$sidenav-font-color: var(--font-color-main) !default;
$sidenav-bg-color: $bg-color !default;
$sidenav-icon-color: var(--font-color-medium) !default;
$sidenav-subheader-color: var(--font-color-medium) !default;
$sidenav-padding: 16px !default;
$sidenav-item-height: 48px !default;
$sidenav-line-height: $sidenav-item-height !default;
Expand All @@ -279,9 +301,13 @@ $spinner-default-color: $secondary-color !default;
// 17. Tabs
// ==========================================================================

$tabs-underline-color: $primary-color-light !default;
$tabs-text-color: $primary-color !default;
$tabs-bg-color: #fff !default;
$tabs-underline-color: $secondary-color !default;
$tabs-text-color: $button-flat-color !default;
$tabs-active-text-color: $secondary-color !default;
$tabs-disabled-text-color: $button-disabled-color !default;
$tabs-bg-color: var(--background-color) !default;
$tabs-hover-bg-color: var(--hover-color) !default;
$tabs-focus-bg-color: var(--focus-color) !default;


// 18. Tables
Expand All @@ -304,7 +330,7 @@ $toast-action-color: #eeff41;
// ==========================================================================

$font-stack: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif !default;
$off-black: rgba(0, 0, 0, 0.87) !default;
$off-black: var(--font-color-main) !default;
// Header Styles
$h1-fontsize: 4.2rem !default;
$h2-fontsize: 3.56rem !default;
Expand Down
1 change: 1 addition & 0 deletions sass/components/forms/_input-fields.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ textarea.materialize-textarea {

// General Styles
background-color: transparent;
color: $input-color;
border: none;
border-bottom: $input-border;
border-radius: 0;
Expand Down
4 changes: 1 addition & 3 deletions sass/components/forms/_range.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ input[type=range] + .thumb {
// Shared
@mixin range-track {
height: $track-height;
background: #c2c0c2;
background: $range-track-color;
border: none;
}

Expand Down Expand Up @@ -100,8 +100,6 @@ input[type=range]::-webkit-slider-thumb {

// FireFox
input[type=range] {
/* fix for FF unable to apply focus style bug */
border: 1px solid white;

/*required for proper track sizing in FF*/
}
Expand Down
7 changes: 4 additions & 3 deletions sass/components/forms/_select.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ select {
display: block;
user-select:none;
z-index: 1;
color: $select-input-color;
}

.caret {
Expand All @@ -83,7 +84,7 @@ select {
bottom: 0;
margin: auto 0;
z-index: 0;
fill: rgba(0,0,0,.87);
fill: $select-input-color;
}

& + label {
Expand Down Expand Up @@ -143,11 +144,11 @@ body.keyboard-focused {

.select-dropdown.dropdown-content {
li {
&:hover {
&:hover:not(.disabled) {
background-color: $select-option-hover;
}

&.selected {
&.selected:not(.disabled) {
background-color: $select-option-selected;
}
}
Expand Down
Loading