saul365/LoveIt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/document

Browse Source 
# Conflicts:
#	assets/css/_core/_base.scss
#	resources/_gen/assets/scss/css/style.template.scss_40942e46c3aa444eabf479d066570690.content
#	resources/_gen/assets/scss/css/style.template.scss_40942e46c3aa444eabf479d066570690.json
This commit is contained in:
Dillon
2020-03-04 01:34:29 +08:00
parent 54a99205d7 5acda2110c
commit 9ed9db5ba3
15 changed files with 226 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
assets/css/_core/_base.scss
View File

@@ -1,6 +1,8 @@
html {
font-family: $global-font-family;
font-size: 16px;
font-size: $global-font-size;
font-weight: $global-font-weight;
line-height: $global-line-height;
width:100%;
}
@@ -27,8 +29,6 @@ html {
}
body {
font-weight: 300;
line-height: 1.5rem;
background-color: $global-background-color;
color: $global-font-color;
overflow-wrap: break-word;
@@ -80,6 +80,10 @@ a {
}
}
b, strong {
font-weight: bold;
}
#dynamic-to-top {
display: none;
overflow: hidden;