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;

26
assets/css/_partial/_header.scss
View File

@@ -6,6 +6,32 @@ header {
.dark-theme & {
background-color: $header-background-color-dark;
}
.header-title {
font-weight: bold;
}
.select-language {
font-weight: $global-font-weight;
border: none;
box-shadow: none;
background: transparent;
background-image: none;
-webkit-appearance: none;
color: $global-font-color;
.dark-theme & {
color: $global-font-color-dark;
}
&:focus {
outline: none;
}
&:hover {
cursor: pointer;
}
}
}
#header-desktop {

23
assets/css/_partial/_home/_summary.scss
View File

@@ -30,24 +30,6 @@
font-size: 1.6rem;
}
.post-meta {
a {
color: $global-font-secondary-color !important;
.dark-theme & {
color: $global-font-secondary-color-dark !important;
}
&:hover {
color: $global-link-hover-color !important;
.dark-theme & {
color: $global-link-hover-color-dark !important;
}
}
}
}
.content {
display: -moz-box;
display: -webkit-box;
@@ -59,6 +41,11 @@
overflow: hidden;
text-overflow: ellipsis;
overflow-wrap: break-word;
color: $global-font-secondary-color;
.dark-theme & {
color: $global-font-secondary-color-dark;
}
h2,
h3,

18
assets/css/_partial/_single/_footer.scss
View File

@@ -20,6 +20,22 @@
.dark-theme & {
color: $global-font-secondary-color-dark;
}
a {
color: $single-link-color;
.dark-theme & {
color: $single-link-color-dark;
}
&:hover {
color: $single-link-hover-color;
.dark-theme & {
color: $single-link-hover-color-dark;
}
}
}
}
.post-info-license {
@@ -32,10 +48,10 @@
}
.post-info-md {
font-size: 0.8rem;
width: 8rem;
a {
font-size: 0.8rem;
color: $single-link-color;
.dark-theme & {

5
assets/css/_variables.scss
View File

@@ -3,8 +3,11 @@
// ==============================
// ========== Global ========== //
// Font family
// Font and Line Height
$global-font-family: -apple-system, BlinkMacSystemFont, PingFang SC, Microsoft Yahei, Segoe UI, Helvetica, Arial, sans-serif, Segoe UI Emoji !default;
$global-font-size: 16px;
$global-font-weight: 400;
$global-line-height: 1.5rem;
// Color of the background
$global-background-color: #fff !default;