Skip to content

Feat #6 night mode toggler #17

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
moshenskyDV wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feat #6 night mode toggler #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
898db60
Feat #6 night mode toggler
moshenskyD Oct 6, 2019
10e67b3
Fix #6 night mode mixins, js check
moshenskyD Oct 7, 2019
b414cee
Fix #6 update respectfully to default dark mode
moshenskyD Oct 8, 2019
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 _includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<footer>
<p>© {{ site.time | date: '%Y' }} elementary, Inc</p>
<ul>
<li><a href="#" id="toggle-night-mode" class="hidden">Toggle night mode</a></li>
<li><a href="https://elementary.io/press" target="_self">Press</a></li>
<li><a href="https://elementary.io/brand" target="_self">Brand</a></li>
<li><a href="https://elementary.io/oem" target="_self">OEMs</a></li>
Expand Down
29 changes: 29 additions & 0 deletions _includes/scripts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,34 @@
}
});
});

// Toggle night mode
// Show toggle trigger if JS enabled
const trigger = document.getElementById('toggle-night-mode');
trigger.classList.remove('hidden');
if (localStorage.getItem('mode') === 'dark') {
document.body.classList.add('dark-mode');
} else if (localStorage.getItem('mode') === 'light') {
document.body.classList.add('light-mode');
}
trigger.addEventListener('click', e => {
e.preventDefault();
switch (localStorage.getItem('mode')) {
case 'dark':
localStorage.setItem('mode', 'light');
document.body.classList.remove('dark-mode');
document.body.classList.add('light-mode');
break;
case 'light':
localStorage.setItem('mode', 'dark');
document.body.classList.remove('light-mode');
document.body.classList.add('dark-mode');
break;
default:
const targetMode = window.matchMedia("(prefers-color-scheme: dark)").matches ? 'light' : 'dark';
localStorage.setItem('mode', targetMode);
document.body.classList.add(`${targetMode}-mode`);
}
})
</script>

16 changes: 2 additions & 14 deletions _sass/_byline.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,13 @@
&::before {
content: "";
border-radius: 50%;
box-shadow:
inset 0 0 0 1px rgba(0, 0, 0, 0.35),
inset 0 0 0 2px rgba(255, 255, 255, 0.1),
inset 0 2px 0 0 rgba(255, 255, 255, 0.45),
inset 0 -2px 0 0 rgba(255, 255, 255, 0.15),
0 1px 3px 0 rgba(0, 0, 0, 0.12),
0 1px 2px 0 rgba(0, 0, 0, 0.24);
height: 100%;
position: absolute;
width: 100%;
@include light-avatar-shadow;

@media (prefers-color-scheme: dark) {
box-shadow:
inset 0 0 0 1px black,
inset 0 0 0 2px rgba(255, 255, 255, 0.05),
inset 0 2px 0 0 rgba(255, 255, 255, 0.22),
inset 0 -2px 0 0 rgba(255, 255, 255, 0.07),
0 1px 3px 0 rgba(0, 0, 0, 0.24),
0 1px 2px 0 rgba(0, 0, 0, 0.48);
@include dark-avatar-shadow;
}
}
}
Expand Down
70 changes: 3 additions & 67 deletions _sass/_code.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,44 +45,14 @@ code {
margin: auto;
overflow: auto;
text-align: left;
background-color: var(--solarized-base3);
color: var(--solarized-base01);

@include light-highlight;

.gl {
background-color: var(--solarized-base2);
padding: 0 0.5em;
text-align: right;
}

.c,
.c1,
.cm,
.sb {
color: var(--solarized-base1);
}

.err,
.g,
.ge,
.go,
.gp,
.gs,
.gt,
.l,
.ld,
.n,
.na,
.nl,
.nn,
.nx,
.p,
.py,
.sd,
.sh,
.w {
color: var(--solarized-base01);
}

.gd,
.il,
.m,
Expand Down Expand Up @@ -157,40 +127,6 @@ code {

@media (prefers-color-scheme: dark) {
.highlight {
background-color: var(--solarized-base03);
color: var(--solarized-base1);

.gl {
background-color: var(--solarized-base02);
}

.c,
.c1,
.cm,
.sb {
color: var(--solarized-base01);
}

.err,
.g,
.ge,
.go,
.gp,
.gs,
.gt,
.l,
.ld,
.n,
.na,
.nl,
.nn,
.nx,
.p,
.py,
.sd,
.sh,
.w {
color: var(--solarized-base1);
}
@include dark-highlight;
}
}
12 changes: 2 additions & 10 deletions _sass/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,14 @@
--solarized-red: #dc322f;
--solarized-yellow: #b58900;

--bg-color: white;
--fg-color: var(--black-500);
--accent-color: var(--blueberry-700);
--header-bg-color: var(--blueberry-300);
--header-fg-color: var(--silver-100);
--secondary-bg-color: #f5f5f5; // Instead of making up a Silver 200
--secondary-fg-color: var(--black-300);
@include light-root;
}

@media (prefers-color-scheme: dark) {
:root {
--bg-color: var(--black-700);
--fg-color: var(--silver-300);
--accent-color: var(--blueberry-300);
--secondary-bg-color: var(--black-500);
--secondary-fg-color: var(--silver-300);
@include dark-root;
}
}

18 changes: 2 additions & 16 deletions _sass/_featured.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,11 @@
}

.featured-image {
background-color: var(--silver-100);
@include light-image;
background-origin: border-box;
background-position: 50%;
background-size: cover;
border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 0.25rem;
box-shadow:
inset 0 0 0 1px rgba(255, 255, 255, 0.05),
inset 0 1px 0 0 rgba(255, 255, 255, 0.2),
inset 0 -1px 0 0 rgba(255, 255, 255, 0.1),
0 1px 3px rgba(0, 0, 0, 0.05),
0 1px 2px rgba(0, 0, 0, 0.1);
display: inline-block;
height: 320px;
margin-bottom: 1rem;
Expand All @@ -90,14 +83,7 @@
}

@media (prefers-color-scheme: dark) {
background-color: var(--silver-900);
border: 1px solid black;
box-shadow:
inset 0 0 0 1px rgba(255, 255, 255, 0.02),
inset 0 1px 0 0 rgba(255, 255, 255, 0.1),
inset 0 -1px 0 0 rgba(255, 255, 255, 0.05),
0 1px 3px rgba(0, 0, 0, 0.1),
0 1px 2px rgba(0, 0, 0, 0.2);
@include dark-image;
}

img {
Expand Down
4 changes: 2 additions & 2 deletions _sass/_figures.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@ figure {

&.card {
img {
background-color: var(--silver-100);
box-shadow:
0 0 0 1px rgba(0, 0, 0, 0.05),
0 3px 3px rgba(0, 0, 0, 0.22);
@include light-figure;

@media (prefers-color-scheme: dark) {
background-color: var(--silver-900);
@include dark-figure;
}
}
}
Expand Down
141 changes: 141 additions & 0 deletions _sass/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
@mixin dark-root {
--bg-color: var(--black-700);
--fg-color: var(--silver-300);
--accent-color: var(--blueberry-300);
--secondary-bg-color: var(--black-500);
--secondary-fg-color: var(--silver-300);
}

@mixin light-root {
--bg-color: white;
--fg-color: var(--black-500);
--accent-color: var(--blueberry-700);
--secondary-bg-color: #f5f5f5;
--secondary-fg-color: var(--black-300);
}

@mixin dark-avatar-shadow {
box-shadow:
inset 0 0 0 1px black,
inset 0 0 0 2px rgba(255, 255, 255, 0.05),
inset 0 2px 0 0 rgba(255, 255, 255, 0.22),
inset 0 -2px 0 0 rgba(255, 255, 255, 0.07),
0 1px 3px 0 rgba(0, 0, 0, 0.24),
0 1px 2px 0 rgba(0, 0, 0, 0.48);
}

@mixin light-avatar-shadow {
box-shadow:
inset 0 0 0 1px rgba(0, 0, 0, 0.35),
inset 0 0 0 2px rgba(255, 255, 255, 0.1),
inset 0 2px 0 0 rgba(255, 255, 255, 0.45),
inset 0 -2px 0 0 rgba(255, 255, 255, 0.15),
0 1px 3px 0 rgba(0, 0, 0, 0.12),
0 1px 2px 0 rgba(0, 0, 0, 0.24);
}

@mixin dark-image {
background-color: var(--silver-900);
border: 1px solid black;
box-shadow:
inset 0 0 0 1px rgba(255, 255, 255, 0.02),
inset 0 1px 0 0 rgba(255, 255, 255, 0.1),
inset 0 -1px 0 0 rgba(255, 255, 255, 0.05),
0 1px 3px rgba(0, 0, 0, 0.1),
0 1px 2px rgba(0, 0, 0, 0.2);
}

@mixin light-image {
background-color: var(--silver-100);
border: 1px solid rgba(0, 0, 0, 0.15);
box-shadow:
inset 0 0 0 1px rgba(255, 255, 255, 0.05),
inset 0 1px 0 0 rgba(255, 255, 255, 0.2),
inset 0 -1px 0 0 rgba(255, 255, 255, 0.1),
0 1px 3px rgba(0, 0, 0, 0.05),
0 1px 2px rgba(0, 0, 0, 0.1);
}

@mixin dark-highlight {
background-color: var(--solarized-base03);
color: var(--solarized-base1);

.gl {
background-color: var(--solarized-base02);
}

.c,
.c1,
.cm,
.sb {
color: var(--solarized-base01);
}

.err,
.g,
.ge,
.go,
.gp,
.gs,
.gt,
.l,
.ld,
.n,
.na,
.nl,
.nn,
.nx,
.p,
.py,
.sd,
.sh,
.w {
color: var(--solarized-base1);
}
}

@mixin light-highlight {
background-color: var(--solarized-base3);
color: var(--solarized-base01);

.gl {
background-color: var(--solarized-base2);
}

.c,
.c1,
.cm,
.sb {
color: var(--solarized-base1);
}

.err,
.g,
.ge,
.go,
.gp,
.gs,
.gt,
.l,
.ld,
.n,
.na,
.nl,
.nn,
.nx,
.p,
.py,
.sd,
.sh,
.w {
color: var(--solarized-base01);
}
}

@mixin dark-figure {
background-color: var(--silver-900);
}

@mixin light-figure {
background-color: var(--silver-100);
}
Loading