Skip to content

Fix dark styles of buttons #1409

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

Merged
stevenjoezhang merged 5 commits into from
Mar 15, 2020
Merged

Fix dark styles of buttons #1409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f67ff53
Fix button styles in dark mode (Pisces & Gemini)
backrunner Mar 12, 2020
f4a1c25
Make styles compatible with prefers-color-scheme
backrunner Mar 12, 2020
7dc0cfb
Fix bug and replace hex color with color variables
backrunner Mar 12, 2020
0324963
Move styles to _colors.styl
backrunner Mar 12, 2020
6c409fb
fix: Replace $btn-default-*** with var(--btn-default-***)
backrunner Mar 12, 2020
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
12 changes: 12 additions & 0 deletions source/css/_colors.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
--table-row-odd-bg-color: $table-row-odd-bg-color;
--table-row-hover-bg-color: $table-row-hover-bg-color;
--menu-item-bg-color: $menu-item-bg-color;
--btn-default-bg: $btn-default-bg;
--btn-default-color: $btn-default-color;
--btn-default-border-color: $btn-default-border-color;
--btn-default-hover-bg: $btn-default-hover-bg;
--btn-default-hover-color: $btn-default-hover-color;
--btn-default-hover-border-color: $btn-default-hover-border-color;
}

if (hexo-config('darkmode')) {
Expand All @@ -26,6 +32,12 @@ if (hexo-config('darkmode')) {
--table-row-odd-bg-color: $table-row-odd-bg-color-dark;
--table-row-hover-bg-color: $table-row-hover-bg-color-dark;
--menu-item-bg-color: $menu-item-bg-color-dark;
--btn-default-bg: $btn-default-bg-dark;
--btn-default-color: $btn-default-color-dark;
--btn-default-border-color: $btn-default-border-color-dark;
--btn-default-hover-bg: $btn-default-hover-bg-dark;
--btn-default-hover-color: $btn-default-hover-color-dark;
--btn-default-hover-border-color: $btn-default-hover-border-color-dark;
}

img {
Expand Down
12 changes: 6 additions & 6 deletions source/css/_common/scaffolding/buttons.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.btn {
background: $btn-default-bg;
border: 2px solid $btn-default-border-color;
background: var(--btn-default-bg);
border: 2px solid var(--btn-default-border-color);
border-radius: $btn-default-radius;
color: $btn-default-color;
color: var(--btn-default-color);
display: inline-block;
font-size: $font-size-small;
line-height: 2;
Expand All @@ -12,9 +12,9 @@
the-transition();

&:hover {
background: $btn-default-hover-bg;
border-color: $btn-default-hover-border-color;
color: $btn-default-hover-color;
background: var(--btn-default-hover-bg);
border-color: var(--btn-default-hover-border-color);
color: var(--btn-default-hover-color);
}

+ .btn {
Expand Down
6 changes: 3 additions & 3 deletions source/css/_common/scaffolding/comments.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
margin: .1em .2em;

&.active {
background: $btn-default-hover-bg;
border-color: $btn-default-hover-border-color;
color: $btn-default-hover-color;
background: var(--btn-default-hover-bg);
border-color: var(--btn-default-hover-border-color);
color: var(--btn-default-hover-color);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions source/css/_schemes/Mist/_posts-expand.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@
// color: $grey-dim;
background: none;
border: 0;
border-bottom: 2px solid $btn-default-border-color;
border-bottom: 2px solid var(--btn-default-border-color);
padding: 0;
transition-property: border;

&:hover {
border-bottom-color: $btn-default-hover-border-color;
border-bottom-color: var(--btn-default-hover-border-color);
}
}
}
2 changes: 1 addition & 1 deletion source/css/_schemes/Muse/_header.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
}

.brand {
background: $btn-default-bg;
background: var(--btn-default-bg);
}
20 changes: 13 additions & 7 deletions source/css/_variables/base.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,19 @@ $code-background = $gainsboro;

// Buttons
// --------------------------------------------------
$btn-default-radius = 0;
$btn-default-bg = $black-deep;
$btn-default-color = white;
$btn-default-border-color = $black-deep;
$btn-default-hover-bg = white;
$btn-default-hover-color = $black-deep;
$btn-default-hover-border-color = $black-deep;
$btn-default-radius = 0;
$btn-default-bg = $black-deep;
$btn-default-bg-dark = $black-deep;
$btn-default-color = white;
$btn-default-color-dark = $text-color-dark;
$btn-default-border-color = $black-deep;
$btn-default-border-color-dark = $black-dim;
$btn-default-hover-bg = white;
$btn-default-hover-bg-dark = $black-light;
$btn-default-hover-color = $black-deep;
$btn-default-hover-color-dark = $text-color-dark;
$btn-default-hover-border-color = $black-deep;
$btn-default-hover-border-color-dark = $black-light;


// Pagination
Expand Down