master
xaoxuu 4 years ago
parent 1e88e23026
commit 0e46f3c5a8
  1. 4
      _config.yml
  2. 6
      layout/_partial/post.ejs
  3. 4
      source/css/_defines/layout.styl
  4. 2
      source/css/_highlight/index.styl
  5. 1
      source/css/_layout/archive.styl
  6. 44
      source/css/_layout/article.styl
  7. 1
      source/css/_layout/friends.styl
  8. 32
      source/css/_layout/main.styl
  9. 1
      source/css/_layout/pagination.styl
  10. 5
      source/css/_layout/search.styl
  11. 15
      source/css/_layout/sidebar.styl
  12. 3
      source/css/_tag-plugins/btns.styl
  13. 12
      source/css/_tag-plugins/folding.styl
  14. 10
      source/css/_tag-plugins/note.styl
  15. 11
      source/css/_tag-plugins/tabs.styl
  16. 2
      source/css/_third-party/fancybox.styl
  17. 8
      source/css/_third-party/valine.styl

@ -31,8 +31,8 @@ style:
h2: 48px # Spacing above H2 (only px unit) h2: 48px # Spacing above H2 (only px unit)
h3: 32px # Spacing above H3 (only px unit) h3: 32px # Spacing above H3 (only px unit)
h4: 16px # Spacing above H4 (only px unit) h4: 16px # Spacing above H4 (only px unit)
line: 1rem # Paragraph spacing block: 1rem # Paragraph spacing between blocks
inline: .5rem # Paragraph spacing within a block p: .5rem # Paragraph spacing within a block
border_radius: border_radius:
card: 12px card: 12px
codeblock: 4px codeblock: 4px

@ -2,10 +2,12 @@
<%- partial('meta',{post:post, position:'header'}) %> <%- partial('meta',{post:post, position:'header'}) %>
<section class="article typo"> <section class="article typo">
<div class="article-entry" itemprop="articleBody"> <div class="article-entry" itemprop="articleBody">
<% if (post.description) { %> <% if (post.excerpt) { %>
<%- post.excerpt %>
<% } else if (post.description) { %>
<p><%- post.description %></p> <p><%- post.description %></p>
<% } else { %> <% } else { %>
<%- post.excerpt || post.content %> <%- post.content %>
<% } %> <% } %>
<% if (theme.layout.on_list.readmore) { %> <% if (theme.layout.on_list.readmore) { %>
<% if ((post.readmore != false) && (post.excerpt || post.description || post.link)) { %> <% if ((post.readmore != false) && (post.excerpt || post.description || post.link)) { %>

@ -21,8 +21,8 @@ $gap = convert(hexo-config('style.gap.base')) || 16px
$gap-h2 = convert(hexo-config('style.gap.h2')) || 48px $gap-h2 = convert(hexo-config('style.gap.h2')) || 48px
$gap-h3 = convert(hexo-config('style.gap.h3')) || 32px $gap-h3 = convert(hexo-config('style.gap.h3')) || 32px
$gap-h4 = convert(hexo-config('style.gap.h4')) || 16px $gap-h4 = convert(hexo-config('style.gap.h4')) || 16px
$gap-line = convert(hexo-config('style.gap.line')) || 1rem // $gap-block = convert(hexo-config('style.gap.block')) || 1rem //
$gap-inline = convert(hexo-config('style.gap.inline')) || .5rem // $gap-p = convert(hexo-config('style.gap.p')) || .5rem //
$gap-card = $gap $gap-card = $gap
// border width // border width

@ -6,7 +6,7 @@
.highlight .highlight
position: relative position: relative
width: 100% width: 100%
margin: $gap-line 0 margin: $gap-block 0
display: block display: block
background: $color-codeblock background: $color-codeblock
font-size: $fontsize-code font-size: $fontsize-code

@ -25,7 +25,6 @@
border-left: $border-line solid transparent border-left: $border-line solid transparent
border-radius: $border-line border-radius: $border-line
vertical-align: middle vertical-align: middle
text-decoration: none
font-size: $fontsize-meta font-size: $fontsize-meta
&.child &.child
padding-left: 2 * $gap padding-left: 2 * $gap

@ -20,7 +20,7 @@
h1,h2,h3,h4,h5,h6 h1,h2,h3,h4,h5,h6
&:first-child &:first-child
margin-top: $gap-line margin-top: $gap-block
padding-top: 0 padding-top: 0
&.title &.title
left: 0 left: 0
@ -49,17 +49,17 @@
h5 h5
font-weight: bold font-weight: bold
color: $color-h5 color: $color-h5
margin-top: $gap-line margin-top: $gap-block
h6 h6
color: $color-h6 color: $color-h6
margin-top: $gap-line margin-top: $gap-block
center center
&,p &,p
text-align: center text-align: center
.aplayer .aplayer
margin: $gap-line 0 margin: $gap-block 0
display: inline-block display: inline-block
width: 400px width: 400px
max-width: 100% max-width: 100%
@ -78,8 +78,8 @@
u u
color: $color-hover color: $color-hover
p p
margin-top: $gap-line margin-top: $gap-block
margin-bottom: $gap-line margin-bottom: $gap-block
text-align: $textalign-p text-align: $textalign-p
max-width: 100% max-width: 100%
@ -98,8 +98,8 @@
list-style: initial list-style: initial
padding-left: 8px padding-left: 8px
margin-left: $gap margin-left: $gap
margin-top: $gap-line margin-top: $gap-block
margin-bottom: $gap-line margin-bottom: $gap-block
ul,ol ul,ol
margin-top: 0 margin-top: 0
margin-bottom: 0 margin-bottom: 0
@ -117,10 +117,7 @@
list-style: initial list-style: initial
ol>li ol>li
list-style: decimal list-style: decimal
a >a,>p>a,blockquote a,div.note a
&:before
display: none
trans()
&:hover &:hover
color: $color-hover color: $color-hover
text-decoration: underline text-decoration: underline
@ -150,8 +147,8 @@
text-align: left text-align: left
word-wrap: normal word-wrap: normal
font-size: $fontsize-list font-size: $fontsize-list
margin-top: $gap-inline margin-top: $gap-p
margin-bottom: $gap-inline margin-bottom: $gap-p
box-shadow: $boxshadow-card box-shadow: $boxshadow-card
position: relative position: relative
width: 100% width: 100%
@ -162,7 +159,7 @@
text-align: justify text-align: justify
color: inherit color: inherit
font-style: italic font-style: italic
margin: $gap-inline 0 margin: $gap-p 0
cite cite
&::before &::before
content: '----' content: '----'
@ -183,8 +180,8 @@
display: block display: block
-moz-box-sizing: border-box -moz-box-sizing: border-box
box-sizing: border-box box-sizing: border-box
margin-top: $gap-line margin-top: $gap-block
margin-bottom: $gap-line margin-bottom: $gap-block
overflow: auto overflow: auto
background: $color-codeblock background: $color-codeblock
font-size: $fontsize-code font-size: $fontsize-code
@ -226,7 +223,7 @@
.widget .widget
background: transparent background: transparent
margin: $gap-line 0 margin: $gap-block 0
box-shadow: none box-shadow: none
border-radius: $border-codeblock border-radius: $border-codeblock
cursor: auto cursor: auto
@ -266,6 +263,7 @@
color: $color-link color: $color-link
font-weight: normal font-weight: normal
&:hover,&.active,&:active &:hover,&.active,&:active
text-decoration: underline
border-left: none border-left: none
background: none background: none
color: $color-hover color: $color-hover
@ -312,17 +310,15 @@
h4 h4
&:before &:before
margin-top: $gap-h4 - $navbar-height - 2 * $gap margin-top: $gap-h4 - $navbar-height - 2 * $gap
margin-bottom: $gap-line margin-bottom: $gap-block
h5 h5
font-weight: bold font-weight: bold
margin-bottom: $gap-line margin-bottom: $gap-block
h6 h6
margin-bottom: $gap-line margin-bottom: $gap-block
article .readmore article .readmore
margin-top: $gap-line margin-top: $gap-block
>a >a
font-size: $fontsize-meta font-size: $fontsize-meta
&:hover
text-decoration: none

@ -30,7 +30,6 @@
width: "calc(100%/2 - %s)" % $gap width: "calc(100%/2 - %s)" % $gap
&:hover &:hover
text-decoration: none
.friend-left .friend-left
.avatar .avatar
transform: scale(1.2) rotate(12deg) transform: scale(1.2) rotate(12deg)

@ -67,13 +67,6 @@
columns: 320px // columns: 320px //
ul.popular-posts
h3
padding: 0
margin: 0
font-size: $fontsize-body
.post-wrapper .post-wrapper
column-break-inside: avoid column-break-inside: avoid
break-inside: avoid-column break-inside: avoid-column
@ -102,13 +95,13 @@
.widget .widget
.content .content
p,ul,ol,table,.tabs,details p,ul,ol,table,.tabs,details
margin-top: $gap-inline margin-top: $gap-p
margin-bottom: $gap-inline margin-bottom: $gap-p
.post .post
padding-top: 0 padding-top: 0
padding-bottom: 0 padding-bottom: 0
margin-top: $gap-inline margin-top: $gap-p
margin-bottom: $gap-inline margin-bottom: $gap-p
&.grid .content .grid.fixed a &.grid .content .grid.fixed a
width: "calc(100%/8 - 0 * %s)" % $gap width: "calc(100%/8 - 0 * %s)" % $gap
@media screen and (max-width: $device-laptop) @media screen and (max-width: $device-laptop)
@ -176,7 +169,6 @@
display: inline display: inline
font-weight: normal font-weight: normal
color: $color-text color: $color-text
text-decoration: none
&:hover &:hover
color: $color-hover color: $color-hover
@ -216,16 +208,12 @@
color: white color: white
p p
color: white color: white
.notlink .notlink
cursor: default cursor: default
&:hover &:hover
color: $color-meta color: $color-meta
p p
color: $color-meta color: $color-meta
display: flex display: flex
align-items: center align-items: center
justify-content: center justify-content: center
@ -234,10 +222,8 @@
border-radius: 4px border-radius: 4px
&:last-child &:last-child
margin-right: 0 margin-right: 0
img,i img,i
display: inline display: inline
i i
margin-right: 4px margin-right: 4px
border-radius: 0 border-radius: 0
@ -247,7 +233,6 @@
color: $color-meta color: $color-meta
padding-left: 0 padding-left: 0
padding-right: 4px padding-right: 4px
a a
display: flex display: flex
justify-content: center justify-content: center
@ -257,18 +242,15 @@
width: 1.2em width: 1.2em
margin-right: 5px margin-right: 5px
transform: translateY(-1px) transform: translateY(-1px)
p p
margin: 0 margin: 0
padding-top: 2px padding-top: 2px
font-weight: normal font-weight: normal
trans() trans()
&:hover &:hover
color: $color-hover color: $color-hover
p p
color: $color-hover color: $color-hover
text-decoration: none
.author .author
img,i img,i
@ -350,12 +332,12 @@ div.hoverbox
.article .article
p[ct] p[ct]
margin-top: 0 margin-top: 0
margin-bottom: $gap-inline margin-bottom: $gap-p
font-size: $fontsize-h4 font-size: $fontsize-h4
color: $color-text color: $color-text
p[cst] p[cst]
margin-top: $gap-inline margin-top: $gap-p
margin-bottom: $gap-inline margin-bottom: $gap-p
font-size: $fontsize-meta font-size: $fontsize-meta

@ -46,7 +46,6 @@
background: $color-block background: $color-block
border-radius: $border-codeblock border-radius: $border-codeblock
&:hover &:hover
text-decoration: none
background: bgcolor($color-hover) background: bgcolor($color-hover)
p.title p.title
color: $color-hover color: $color-hover

@ -214,17 +214,12 @@
position: relative position: relative
display: block display: block
padding: $gap padding: $gap
text-decoration: none
border-radius: $border-card border-radius: $border-card
b[mark] b[mark]
color: darken($color-theme, 10) color: darken($color-theme, 10)
text-decoration: underline text-decoration: underline
&:hover &:hover
background: bgcolor($color-theme) background: bgcolor($color-theme)
// .digest, .icon
// color: $color-hover
// .title
// color: $color-hover

@ -58,8 +58,8 @@
max-height: "calc(100% - %s)" % $offset max-height: "calc(100% - %s)" % $offset
max-width: 100% max-width: 100%
p p
margin-top: $gap-inline margin-top: $gap-p
margin-bottom: $gap-inline margin-bottom: $gap-p
ul>li ul>li
a a
color: $color-meta color: $color-meta
@ -210,8 +210,6 @@
font-size: $fontsize-meta font-size: $fontsize-meta
font-weight: bold font-weight: bold
line-height: 2.4em line-height: 2.4em
&:hover
text-decoration: none
i i
margin-left: 1px margin-left: 1px
img img
@ -282,19 +280,12 @@
width: "calc(100%/3 - 0 * %s)" % $gap width: "calc(100%/3 - 0 * %s)" % $gap
// &.category
// .content
// font-weight: bold
&.tagcloud &.tagcloud
.content .content
text-align: justify text-align: justify
padding: $gap * 0.5 $gap padding: $gap * 0.5 $gap
a a
display:inline-block display: inline-block
trans() trans()
line-height: 1.6em line-height: 1.6em
&:hover &:hover

@ -10,7 +10,6 @@
trans() trans()
&:hover &:hover
color: $color-inner color: $color-inner
text-decoration: none
background: $color-hover background: $color-hover
&[regular] &[regular]
a a
@ -125,8 +124,6 @@ div.btns
line-height: 1.3 line-height: 1.3
img img
margin: .4em auto margin: .4em auto
&:hover
text-decoration: none
&:not([href]) &:not([href])
cursor: default cursor: default
color: inherit color: inherit

@ -1,7 +1,7 @@
details details
display: block display: block
padding: $gap padding: $gap
margin: $gap-line 0 margin: $gap-block 0
overflow: hidden overflow: hidden
border-radius: $border-codeblock border-radius: $border-codeblock
border: 1px solid darken($color-block, 4) border: 1px solid darken($color-block, 4)
@ -24,8 +24,8 @@ details
float: right float: right
content: '+' content: '+'
div.content div.content
margin-top: $gap-line margin-top: $gap-block
margin-bottom: unit($gap-line, px) - unit($gap, px) margin-bottom: unit($gap-block, px) - unit($gap, px)
&[blue] &[blue]
border: 1px solid darken(bgcolor($color-md-blue), 4) border: 1px solid darken(bgcolor($color-md-blue), 4)
>summary >summary
@ -73,11 +73,11 @@ details[open]
border-bottom: 1px solid darken(bgcolor($color-mac-red), 8) border-bottom: 1px solid darken(bgcolor($color-mac-red), 8)
>summary >summary
color: $color-p color: $color-p
margin-bottom: $gap-line margin-bottom: $gap-block
&:hover &:hover
&:after &:after
content: '-' content: '-'
> >
p,.tabs,ul,ol p,.tabs,ul,ol
margin-top: $gap-inline margin-top: $gap-p
margin-bottom: $gap-inline margin-bottom: $gap-p

@ -5,9 +5,9 @@ div.note
border($c) border($c)
return mix($c, $color-card, 80) return mix($c, $color-card, 80)
position: relative position: relative
margin-top: $gap-line margin-top: $gap-block
margin-bottom: $gap-line margin-bottom: $gap-block
padding: $gap-inline $gap padding: $gap-p $gap
padding-left: "calc(16px + %s)" % $gap padding-left: "calc(16px + %s)" % $gap
border-radius: $border-codeblock border-radius: $border-codeblock
@ -33,8 +33,8 @@ div.note
blockquote, blockquote,
img img
font-size: $fontsize-list font-size: $fontsize-list
margin-top: $gap-inline margin-top: $gap-p
margin-bottom: $gap-inline margin-bottom: $gap-p
&::before &::before
position: absolute position: absolute

@ -4,14 +4,14 @@ $tbr = 4px
div.tabs div.tabs
display: block display: block
position: relative position: relative
margin-top: $gap-line margin-top: $gap-block
margin-bottom: $gap-line margin-bottom: $gap-block
border-radius: $tbr border-radius: $tbr
background: $color-card background: $color-card
border: 1px solid $border-color border: 1px solid $border-color
.highlight,p,ul,ol .highlight,p,ul,ol
margin-top: $gap-inline margin-top: $gap-p
margin-bottom: $gap-inline margin-bottom: $gap-p
div.tabs div.tabs
ul.nav-tabs ul.nav-tabs
@ -36,7 +36,6 @@ div.tabs
color: $color-meta color: $color-meta
border: 1px solid transparent border: 1px solid transparent
&:hover &:hover
text-decoration: none
color: $color-p color: $color-p
&.active a &.active a
cursor: default cursor: default
@ -49,7 +48,7 @@ div.tabs
border-top: 1px solid $border-color border-top: 1px solid $border-color
margin-top: -1px margin-top: -1px
.tab-pane .tab-pane
padding: $gap-inline $gap padding: $gap-p $gap
&:not(.active) &:not(.active)
display: none display: none
&.active &.active

@ -1,5 +1,5 @@
div.fancybox div.fancybox
margin: $gap-line 0 margin: $gap-block 0
$sp = 1px $sp = 1px
>a,>p>a >a,>p>a
margin: $sp margin: $sp

@ -40,7 +40,6 @@
margin-top: 6px margin-top: 6px
background: transparent background: transparent
.vedit .vctrl span .vedit .vctrl span
color: $color-link
padding: 0 padding: 0
margin: 10px margin: 10px
@ -71,7 +70,6 @@
trans() trans()
&:hover &:hover
color: $color-hover color: $color-hover
text-decoration: underline
div.info div.info
box-shadow: none box-shadow: none
@ -82,15 +80,13 @@
span span
&.vnick &.vnick
color: $color-meta color: $color-meta
cursor: default
a a
&.vnick &.vnick
color: #ff9800 color: #ff9800
font-weight: bold font-weight: bold
&:hover &:hover
color: $color-hover color: $color-hover
text-decoration: underline
@ -122,8 +118,6 @@
&:hover &:hover
color: $color-hover color: $color-hover
text-decoration: underline text-decoration: underline
&:active
color: darken($color-hover, .25)
.vinput .vinput
color: $color-text color: $color-text

Loading…
Cancel
Save