Merge branch 'develop'

This commit is contained in:
Dillon
2020-04-29 22:27:11 +08:00
8 changed files with 14 additions and 21 deletions

View File

@@ -5,14 +5,14 @@
[theme=dark] & { [theme=dark] & {
color: if($dark, $global-link-color-dark, $single-link-color-dark); color: if($dark, $global-link-color-dark, $single-link-color-dark);
} }
}
&:active, a:active,
&:hover { a:hover {
color: if($light, $global-link-hover-color, $single-link-hover-color); color: if($light, $global-link-hover-color, $single-link-hover-color);
[theme=dark] & { [theme=dark] & {
color: if($dark, $global-link-hover-color-dark, $single-link-hover-color-dark); color: if($dark, $global-link-hover-color-dark, $single-link-hover-color-dark);
}
} }
} }
} }

View File

@@ -58,6 +58,7 @@
h6, h6,
p { p {
font-size: 1rem; font-size: 1rem;
line-height: 1.5;
display: inline; display: inline;
&::after { &::after {
@@ -66,16 +67,8 @@
} }
} }
h2,
h3,
h4,
h5,
h6 {
line-height: 2;
}
h2 { h2 {
font-size: 1.2rem; font-size: 1.125rem;
} }
@include link(false, true); @include link(false, true);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -412,7 +412,7 @@ class Theme {
const rect = $page.getBoundingClientRect(); const rect = $page.getBoundingClientRect();
$toc.style.left = `${rect.left + rect.width + 20}px`; $toc.style.left = `${rect.left + rect.width + 20}px`;
$toc.style.maxWidth = `${$page.getBoundingClientRect().left - 20}px`; $toc.style.maxWidth = `${$page.getBoundingClientRect().left - 20}px`;
const $tocLinkElements = $tocCore.getElementsByTagName('a'); const $tocLinkElements = $tocCore.querySelectorAll('a:first-child');
const $tocLiElements = $tocCore.getElementsByTagName('li'); const $tocLiElements = $tocCore.getElementsByTagName('li');
const $headerLinkElements = document.getElementsByClassName('headerLink'); const $headerLinkElements = document.getElementsByClassName('headerLink');
const headerIsFixed = this.config.headerMode.desktop !== 'normal'; const headerIsFixed = this.config.headerMode.desktop !== 'normal';