Move card_counts and split off fusion_vars

This commit is contained in:
Henrik Giesel 2021-04-13 16:01:41 +02:00
parent fbc21f0090
commit 825509ba0c
10 changed files with 114 additions and 52 deletions

View file

@ -1,34 +0,0 @@
.review-count {
color: var(--review-count);
}
.new-count {
color: var(--new-count);
}
.learn-count {
color: var(--learn-count);
}
.zero-count {
color: var(--zero-count);
}
.nightMode {
.review-count {
color: var(--review-count);
}
.new-count {
color: var(--new-count);
}
.learn-count {
color: var(--learn-count);
}
.zero-count {
color: var(--zero-count);
}
}

View file

@ -1,7 +1,7 @@
/* Copyright: Ankitects Pty Ltd and contributors /* Copyright: Ankitects Pty Ltd and contributors
* License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */
@use 'card_counts'; @use 'ts/sass/card_counts';
a.deck { a.deck {
color: var(--text-fg); color: var(--text-fg);

View file

@ -1,7 +1,7 @@
/* Copyright: Ankitects Pty Ltd and contributors /* Copyright: Ankitects Pty Ltd and contributors
* License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */
@use 'card_counts'; @use 'ts/sass/card_counts';
.smallLink { .smallLink {
font-size: 10px; font-size: 10px;

View file

@ -1,7 +1,7 @@
/* Copyright: Ankitects Pty Ltd and contributors /* Copyright: Ankitects Pty Ltd and contributors
* License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */
@use 'card_counts'; @use 'ts/sass/card_counts';
body { body {
margin: 0; margin: 0;

View file

@ -1,10 +1,4 @@
/* night-mode-specific colours */ @use 'fusion_vars';
$fusion-button-gradient-start: #555555;
$fusion-button-gradient-end: #656565;
$fusion-button-outline: #222222;
$fusion-button-hover-bg: #656565;
$fusion-button-border: #646464;
$fusion-button-base-bg: #454545;
.isWin { .isWin {
button { button {
@ -37,11 +31,11 @@ $fusion-button-base-bg: #454545;
/* match the fusion button gradient */ /* match the fusion button gradient */
background: linear-gradient( background: linear-gradient(
0deg, 0deg,
$fusion-button-gradient-start 0%, fusion_vars.$button-gradient-start 0%,
$fusion-button-gradient-end 100% fusion_vars.$button-gradient-end 100%
); );
box-shadow: 0 0 3px $fusion-button-outline; box-shadow: 0 0 3px fusion_vars.$button-outline;
border: 1px solid $fusion-button-border; border: 1px solid fusion_vars.$button-border;
border-radius: 2px; border-radius: 2px;
padding: 10px; padding: 10px;
@ -50,7 +44,7 @@ $fusion-button-base-bg: #454545;
} }
button:hover { button:hover {
background: $fusion-button-hover-bg; background: fusion_vars.$button-hover-bg;
} }
} }

15
ts/sass/_card_counts.scss Normal file
View file

@ -0,0 +1,15 @@
.review-count {
color: var(--review-count);
}
.new-count {
color: var(--new-count);
}
.learn-count {
color: var(--learn-count);
}
.zero-count {
color: var(--zero-count);
}

View file

@ -0,0 +1,7 @@
/* night-mode-specific colours */
$fusion-button-gradient-start: #555555;
$fusion-button-gradient-end: #656565;
$fusion-button-outline: #222222;
$fusion-button-hover-bg: #656565;
$fusion-button-border: #646464;
$fusion-button-base-bg: #454545;

65
ts/sass/buttons.scss Normal file
View file

@ -0,0 +1,65 @@
@use 'fusion_vars';
.isWin {
button {
font-size: 12px;
}
}
.isMac {
button {
font-size: 13px;
}
}
.isLin {
button {
font-size: 14px;
-webkit-appearance: none;
border-radius: 3px;
padding: 5px;
border: 1px solid var(--border);
}
}
.nightMode {
button {
-webkit-appearance: none;
color: var(--text-fg);
/* match the fusion button gradient */
background: linear-gradient(
0deg,
fusion_vars.$button-gradient-start 0%,
fusion_vars.$button-gradient-end 100%
);
box-shadow: 0 0 3px fusion_vars.$button-outline;
border: 1px solid fusion_vars.$button-border;
border-radius: 2px;
padding: 10px;
padding-top: 3px;
padding-bottom: 3px;
}
button:hover {
background: fusion_vars.$button-hover-bg;
}
}
/* imitate standard macOS dark mode buttons */
.isMac.nightMode.macos-dark-mode button:not(.linkb) {
background: #656565;
box-shadow: 0 1px 2px #222222;
border-top-color: #848484;
border-top-width: 0.5px;
border-bottom: 0;
border-left: 0;
border-right: 0;
padding-top: 2px;
padding-bottom: 2px;
padding-left: 15px;
padding-right: 15px;
color: #e5e5e5;
}

15
ts/sass/card_counts.scss Normal file
View file

@ -0,0 +1,15 @@
.review-count {
color: var(--review-count);
}
.new-count {
color: var(--new-count);
}
.learn-count {
color: var(--learn-count);
}
.zero-count {
color: var(--zero-count);
}

View file

@ -2,7 +2,7 @@
* License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */
@use 'vars'; @use 'vars';
@use 'buttons'; @use 'fusion_vars';
@mixin night-mode { @mixin night-mode {
&::-webkit-scrollbar { &::-webkit-scrollbar {
@ -18,7 +18,7 @@
} }
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
background: buttons.$fusion-button-hover-bg; background: fusion_vars.$button-hover-bg;
border-radius: 8px; border-radius: 8px;
&:horizontal { &:horizontal {