diff --git a/assets/css/_core/_base.scss b/assets/css/_core/_base.scss new file mode 100644 index 00000000..b85d88d8 --- /dev/null +++ b/assets/css/_core/_base.scss @@ -0,0 +1,83 @@ +/** Font **/ +/* Lato */ +@import url(https://fonts.googleapis.com/css?family=Lato:100,300,400,700,900); + +/* Montserrat */ +@import url(https://fonts.googleapis.com/css?family=Montserrat:400,500,600,700,800); + +/* Roboto */ +@import url(https://fonts.googleapis.com/css?family=Roboto:400,900); + +html { + font-family: "Roboto", -apple-system, BlinkMacSystemFont, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", STHeiti, "Microsoft Yahei", "WenQuanYi Micro Hei", Arial, Verdana, sans-serif; + + /* scrollbar, only support webkit */ + &::-webkit-scrollbar { + width: 8px; + height: 8px; + } + + &::-webkit-scrollbar-thumb { + height: 40px; + background-color: #eee; + border-radius: 16px; + + &:hover { + background-color: #C2C2C2; + } + } +} + +::selection { + background: rgba(0, 149, 255, 0.1); +} + +body { + font-size: 16px; + font-weight: 400; + line-height: 26px; + background-color: $global-background-color; + color: $global-font-color; + + &:before { + content: ""; + background-repeat: no-repeat; + background-position: center; + opacity: 0.05; + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: -1; + -webkit-filter: grayscale(100%); + -moz-filter: grayscale(100%); + -ms-filter: grayscale(100%); + -o-filter: grayscale(100%); + filter: grayscale(100%); + filter: gray; + } + + &.dark-theme { + color: $global-font-color-dark; + background-color: $global-background-color-dark; + } +} + +a { + color: $global-link-color; + text-decoration: none; + transition: color 0.2s ease, border-color 0.2s ease, background 0.2s ease, opacity 0.2s ease; + + &:hover { + color: $global-link-hover-color; + } + + .dark-theme & { + color: $global-link-color-dark; + + &:hover { + color: $global-link-hover-color-dark; + } + } +} diff --git a/assets/css/_core/layout.scss b/assets/css/_core/_layout.scss similarity index 84% rename from assets/css/_core/layout.scss rename to assets/css/_core/_layout.scss index 6996b9a2..4a67d0fd 100644 --- a/assets/css/_core/layout.scss +++ b/assets/css/_core/_layout.scss @@ -3,7 +3,7 @@ .wrapper { display: flex; flex-direction: column; - min-height: 100vh; + min-height: 98vh; width: 100%; } @@ -24,17 +24,18 @@ .main { flex: 1 0 auto; } -.container{ + +.container { padding-left: 1em; padding-right: 1em; } .footer { - height: 4rem; + height: 2rem; width: 100%; text-align: center; - line-height: 4rem; - padding-top: 2em; + line-height: 1.2rem; + padding-top: 1.6em; } .notfound { diff --git a/assets/css/_core/media.scss b/assets/css/_core/_media.scss similarity index 76% rename from assets/css/_core/media.scss rename to assets/css/_core/_media.scss index 756a6dd9..da57b0c4 100644 --- a/assets/css/_core/media.scss +++ b/assets/css/_core/_media.scss @@ -8,27 +8,28 @@ position: fixed; width: 100%; z-index: 100; - transition: all 0.6s ease 0s; + transition: all 0.3s ease 0s; .container { padding: 0; margin: 0; - height: 5em; - line-height: 5.5em; - background: $light-background-color; + height: 4.5em; + line-height: 4.5em; + background: $global-background-color; .navbar-header { display: flex; justify-content: space-between; align-items: center; width: 100%; + font-size: 18px; padding-right: 1em; padding-left: 1em; box-sizing: border-box; .menu-toggle { cursor: pointer; - line-height: 5.5em; + line-height: 4.5em; span { display: block; @@ -38,12 +39,12 @@ -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - -webkit-transition: .25s margin .25s, .25s transform; - -moz-transition: .25s margin .25s, .25s transform; - transition: .25s margin .25s, .25s transform; + -webkit-transition: .2s margin .2s, .2s transform; + -moz-transition: .2s margin .2s, .2s transform; + transition: .2s margin .2s, .2s transform; .dark-theme & { - background: $dark-font-color; + background: $global-font-color-dark; } } @@ -57,9 +58,9 @@ &.active { span { - -webkit-transition: .25s margin, .25s transform .25s; - -moz-transition: .25s margin, .25s transform .25s; - transition: .25s margin, .25s transform .25s; + -webkit-transition: .2s margin, .2s transform .2s; + -moz-transition: .2s margin, .2s transform .2s; + transition: .2s margin, .2s transform .2s; } span:nth-child(1) { @@ -85,10 +86,8 @@ .menu { text-align: center; - background: #ffffff; - border-top: 2px solid #000000; - padding-top: 1em; - padding-bottom: 1em; + background: $global-background-color; + border-top: 2px solid $global-font-color; display: none; box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.1), 0px 4px 8px rgba(0, 0, 0, 0.1); @@ -102,13 +101,13 @@ } .dark-theme & { - background: $dark-background-color; - border-top: 2px solid $dark-font-secondary-color; + background: $global-background-color-dark; + border-top: 2px solid $global-font-color-dark; } } .dark-theme & { - background: $dark-background-color !important; + background: $global-background-color-dark !important; } } } diff --git a/assets/css/_core/normalize.scss b/assets/css/_core/_normalize.scss similarity index 100% rename from assets/css/_core/normalize.scss rename to assets/css/_core/_normalize.scss diff --git a/assets/css/_core/base.scss b/assets/css/_core/base.scss deleted file mode 100644 index b2b4755a..00000000 --- a/assets/css/_core/base.scss +++ /dev/null @@ -1,129 +0,0 @@ -/** Font **/ -/* Lato */ -@import url(https://fonts.googleapis.com/css?family=Lato:100,300,400,700,900); - -/* Montserrat */ -@import url(https://fonts.googleapis.com/css?family=Montserrat:400,500,600,700,800); - -/* Roboto */ -@import url(https://fonts.googleapis.com/css?family=Roboto:400,900); - -html { - &::-webkit-scrollbar { - width: 8px; - height: 8px; - } - &::-webkit-scrollbar-thumb { - height: 40px; - background-color: #eee; - border-radius: 16px; - &:hover { - background-color: #ddd; - } - } -} - -::selection { - background: rgba(0, 149, 255, 0.1); -} - -html { - font-family: "Roboto", -apple-system, BlinkMacSystemFont, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", STHeiti, "Microsoft Yahei", "WenQuanYi Micro Hei", Arial, Verdana, sans-serif; -} - -body { - font-size: 11pt; - font-weight: 400; - line-height: 2em; - background-color: $light-background-color; - color: $light-font-color; - &:before { - content: ""; - background-repeat: no-repeat; - background-position: center; - opacity: 0.05; - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: -1; - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(100%); - -o-filter: grayscale(100%); - filter: grayscale(100%); - filter: gray; - } - - &.dark-theme { - background-color: $dark-background-color; - color: $dark-font-color; - } -} - -a { - color: $light-global-link-color; - text-decoration: none; - transition: color 0.2s ease, border-color 0.2s ease, background 0.2s ease, opacity 0.2s ease; - &:hover { - color: $light-global-link-hover-color; - text-decoration: none; - transition: color 0.2s ease, border-color 0.2s ease, background 0.2s ease, opacity 0.2s ease; - } - - .dark-theme & { - color: $dark-global-link-color; - text-decoration: none; - transition: color 0.2s ease, border-color 0.2s ease, background 0.2s ease, opacity 0.2s ease; - - &:hover { - color: $dark-global-link-hover-color; - text-decoration: none; - transition: color 0.2s ease, border-color 0.2s ease, background 0.2s ease, opacity 0.2s ease; - } - } -} - -blockquote { - font-size: 1rem; - display: block; - border-width: 1px 0; - border-style: solid; - border-color: $light-border-color; - padding: 1.5em 1.2em 0.5em 1.2em; - margin: 0 0 2em 0; - position: relative; - - &:before { - content: '\201C'; - position: absolute; - top: 0em; - left: 50%; - transform: translate(-50%, -50%); - width: 3rem; - height: 2rem; - font: 6em/1.08em 'PT Sans', sans-serif; - color: $light-post-link-color; - text-align: center; - - .dark-theme & { - color: $dark-post-link-color; - } - } - &:after { - content: "#blockquote" attr(cite); - display: block; - text-align: right; - font-size: 0.875em; - color: $light-post-link-color; - - .dark-theme & { - color: $dark-post-link-color; - } - } - - .dark-theme & { - border-color: $dark-border-color; - } -} diff --git a/assets/css/_iconfont.scss b/assets/css/_iconfont.scss deleted file mode 100644 index 833b6128..00000000 --- a/assets/css/_iconfont.scss +++ /dev/null @@ -1,261 +0,0 @@ -@font-face {font-family: "iconfont"; - src: url('../fonts/iconfont/iconfont.eot'); /* IE9 */ - src: url('../fonts/iconfont/iconfont.eot#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/iconfont/iconfont.woff2') format('woff2'), - url('../fonts/iconfont/iconfont.woff') format('woff'), - url('../fonts/iconfont/iconfont.ttf') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ - url('../fonts/iconfont/iconfont.svg#iconfont') format('svg'); /* iOS 4.1- */ -} - -.iconfont { - font-family: "iconfont" !important; - font-size: 16px; - font-style: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.icon-weibo:before { - content: "\e6c4"; -} - -.icon-codepen:before { - content: "\ea79"; -} - -.icon-spotify:before { - content: "\ebf4"; -} - -.icon-reddit:before { - content: "\e761"; -} - -.icon-dajiantou:before { - content: "\e642"; -} - -.icon-xiaojiantou:before { - content: "\e666"; -} - -.icon-deviantart:before { - content: "\e6c6"; -} - -.icon-dribbble:before { - content: "\e6d8"; -} - -.icon-zhihu:before { - content: "\e6ba"; -} - -.icon-wordpress:before { - content: "\e848"; -} - -.icon-twitter:before { - content: "\eb2a"; -} - -.icon-whatsapp:before { - content: "\eb92"; -} - -.icon-facebook:before { - content: "\e638"; -} - -.icon-gitlab:before { - content: "\e719"; -} - -.icon-medium:before { - content: "\e783"; -} - -.icon-steam:before { - content: "\e811"; -} - -.icon-jsfiddle:before { - content: "\e752"; -} - -.icon-soundcloud:before { - content: "\e81d"; -} - -.icon-ycombinator:before { - content: "\eb32"; -} - -.icon-linkedin:before { - content: "\e696"; -} - -.icon-pinterest:before { - content: "\e697"; -} - -.icon-500px:before { - content: "\e607"; -} - -.icon-bitbucket:before { - content: "\e645"; -} - -.icon-instagram:before { - content: "\e6b6"; -} - -.icon-slideshare:before { - content: "\e6fd"; -} - -.icon-twitch:before { - content: "\e72a"; -} - -.icon-vine:before { - content: "\e735"; -} - -.icon-xing:before { - content: "\e741"; -} - -.icon-snapchat:before { - content: "\e8b2"; -} - -.icon-douban:before { - content: "\e688"; -} - -.icon-github:before { - content: "\e691"; -} - -.icon-t:before { - content: "\e601"; -} - -.icon-mail:before { - content: "\e622"; -} - -.icon-behance:before { - content: "\e621"; -} - -.icon-POP_lastfm:before { - content: "\e681"; -} - -.icon-odnoklassniki:before { - content: "\e624"; -} - -.icon-strava:before { - content: "\e627"; -} - -.icon-goodreads:before { - content: "\e62a"; -} - -.icon-kickstarter:before { - content: "\e644"; -} - -.icon-bandcamp:before { - content: "\e64b"; -} - -.icon-flickr:before { - content: "\e660"; -} - -.icon-keybase:before { - content: "\e665"; -} - -.icon-paypal:before { - content: "\e667"; -} - -.icon-mastodon:before { - content: "\e94a"; -} - -.icon-folder:before { - content: "\e7d1"; -} - -.icon-skype:before { - content: "\e87d"; -} - -.icon-icon-tag:before { - content: "\e632"; -} - -.icon-sun:before { - content: "\e684"; -} - -.icon-timer:before { - content: "\e664"; -} - -.icon-researchgate:before { - content: "\e693"; -} - -.icon-angellist:before { - content: "\f163"; -} - -.icon-mix:before { - content: "\f1f5"; -} - -.icon-patreon:before { - content: "\f209"; -} - -.icon-quora:before { - content: "\f218"; -} - -.icon-stack-overflow:before { - content: "\f239"; -} - -.icon-telegram-plane:before { - content: "\f246"; -} - -.icon-tumblr:before { - content: "\f24a"; -} - -.icon-vk:before { - content: "\f25e"; -} - -.icon-youtube:before { - content: "\e765"; -} - -.icon-Googlescholar:before { - content: "\e736"; -} - -.icon-foursquare:before { - content: "\e8ed"; -} - diff --git a/assets/css/_page/home.scss b/assets/css/_page/_home.scss similarity index 96% rename from assets/css/_page/home.scss rename to assets/css/_page/_home.scss index 67f3bee8..d2e9a409 100644 --- a/assets/css/_page/home.scss +++ b/assets/css/_page/_home.scss @@ -52,7 +52,7 @@ h2.description { } } - .iconfont { - font-size: 2em; + i { + font-size: 1.4em; } } diff --git a/assets/css/_page/home_post.scss b/assets/css/_page/_home_post.scss similarity index 69% rename from assets/css/_page/home_post.scss rename to assets/css/_page/_home_post.scss index 49ddd47a..1e5243a9 100644 --- a/assets/css/_page/home_post.scss +++ b/assets/css/_page/_home_post.scss @@ -28,14 +28,14 @@ color: rgba(85, 85, 85, 0.52941) !important; .dark-theme & { - color: $dark-font-secondary-color !important; + color: $global-font-secondary-color-dark !important; } &:hover { - color: $light-font-secondary-color !important; + color: $global-font-secondary-color !important; .dark-theme & { - color: $dark-font-secondary-color !important; + color: $global-font-secondary-color-dark !important; } } } @@ -47,14 +47,14 @@ color: rgba(85, 85, 85, 0.52941) !important; .dark-theme & { - color: $dark-font-secondary-color !important; + color: $global-font-secondary-color-dark !important; } &:hover { - color: $light-font-secondary-color !important; + color: $global-font-secondary-color !important; .dark-theme & { - color: $dark-font-secondary-color !important; + color: $global-font-secondary-color-dark !important; } } } diff --git a/assets/css/_page/post.scss b/assets/css/_page/_post.scss similarity index 59% rename from assets/css/_page/post.scss rename to assets/css/_page/_post.scss index 5e874da4..3c3c8fa6 100644 --- a/assets/css/_page/post.scss +++ b/assets/css/_page/_post.scss @@ -7,42 +7,44 @@ margin: 0 auto; padding-top: 2rem; - .post-header h1 { - margin: 0 !important; - } - - .post-title { - font-size: 2em; - line-height: 1.5em; + .post-header { + .post-title { + margin: 0 !important; + font-size: 2em; + line-height: 1.5em; + } } .post-meta { + font-size: 14px; color: rgba(85, 85, 85, 0.52941) !important; + > span { + display: inline-block; + } + .dark-theme & { - color: $dark-font-secondary-color !important; + color: $global-font-secondary-color-dark !important; } a { - color: $light-post-link-color; + color: $post-link-color; .dark-theme & { - color: $dark-post-link-color; + color: $post-link-color-dark; } &:hover { - color: $light-post-link-hover-color; + color: $post-link-hover-color; .dark-theme & { - color: $dark-post-link-hover-color; + color: $post-link-hover-color-dark; } } } } .post-content { - padding-top: 1rem; - h2, h3, h4, @@ -55,36 +57,36 @@ h2::before { content: "#"; margin-right: 5px; - color: $light-post-link-color; + color: $post-link-color; .dark-theme & { - color: $dark-post-link-color; + color: $post-link-color-dark; } } h3::before { content: "|"; margin-right: 5px; - color: $light-post-link-color; + color: $post-link-color; .dark-theme & { - color: $dark-post-link-color; + color: $post-link-color-dark; } } a { - color: $light-post-link-color; + color: $post-link-color; .dark-theme & { - color: $dark-post-link-color; + color: $post-link-color-dark; } } a:hover { - color: $light-post-link-hover-color; + color: $post-link-hover-color; .dark-theme &:hover { - color: $dark-post-link-hover-color; + color: $post-link-hover-color-dark; font-weight: bold; } } @@ -145,7 +147,51 @@ margin: 0 !important; } - @import "../_partial/post/code.scss"; + blockquote { + font-size: 1rem; + display: block; + border-width: 1px 0; + border-style: solid; + border-color: $global-border-color; + padding: 1.5em 1.2em 0.5em 1.2em; + margin: 0 0 2em 0; + position: relative; + + &:before { + content: '\201C'; + position: absolute; + top: 0em; + left: 50%; + transform: translate(-50%, -50%); + width: 3rem; + height: 2rem; + font: 6em/1.08em 'PT Sans', sans-serif; + color: $post-link-color; + text-align: center; + + .dark-theme & { + color: $post-link-color-dark; + } + } + &:after { + content: "#blockquote" attr(cite); + display: block; + text-align: right; + font-size: 0.875em; + color: $post-link-color; + + .dark-theme & { + color: $post-link-color-dark; + } + } + + .dark-theme & { + border-color: $global-border-color-dark; + } + } + + @import "../_partial/_post/code"; + @import "../_partial/_post/admonition"; .typeit { .code { @@ -192,22 +238,6 @@ } } } - - .align-center { - text-align: center; - } - - .align-right { - text-align: right; - } - - .align-left { - text-align: left; - } - - .float-right { - float: right; - } } p { @@ -215,18 +245,18 @@ margin: .5em 0 .5em 0; } - .post-copyright { + .post-info { margin-top: 5rem; - border-top: 1px solid $light-border-color; - border-bottom: 1px solid $light-border-color; + border-top: 1px solid $global-border-color; + border-bottom: 1px solid $global-border-color; - .copyright-item { + .post-info-item { margin: 5px 0; } .dark-theme & { - border-top: 1px solid $dark-border-color; - border-bottom: 1px solid $dark-border-color; + border-top: 1px solid $global-border-color-dark; + border-bottom: 1px solid $global-border-color-dark; } } @@ -234,11 +264,9 @@ padding: 1rem 0 1rem; display: flex; justify-content: space-between; - } .post-nav { - &:before, &:after { content: " "; @@ -272,11 +300,27 @@ } } - .tag:not(:last-child) a::after { - content: " / "; - } - .post-comment { padding: 3em 0; } + + .align-left { + text-align: left; + } + + .align-center { + text-align: center; + } + + .align-right { + text-align: right; + } + + .float-left { + float: left; + } + + .float-right { + float: right; + } } diff --git a/assets/css/_page/tags.scss b/assets/css/_page/_tags.scss similarity index 69% rename from assets/css/_page/tags.scss rename to assets/css/_page/_tags.scss index 960c781c..9e466eae 100644 --- a/assets/css/_page/tags.scss +++ b/assets/css/_page/_tags.scss @@ -13,19 +13,19 @@ &:active, &:focus, &:hover { - color: $light-global-link-hover-color; + color: $global-link-hover-color; transform: scale(1.1); .dark-theme & { - color: $dark-global-link-hover-color; + color: $global-link-hover-color-dark; } } small { - color: $light-font-secondary-color; + color: $global-font-secondary-color; .dark-theme & { - color: $dark-global-link-hover-color; + color: $global-link-hover-color-dark; } } } diff --git a/assets/css/_page/terms.scss b/assets/css/_page/_terms.scss similarity index 86% rename from assets/css/_page/terms.scss rename to assets/css/_page/_terms.scss index d0cd83e3..16bba2ac 100644 --- a/assets/css/_page/terms.scss +++ b/assets/css/_page/_terms.scss @@ -41,17 +41,17 @@ max-width: 95%; &:hover { - color: $light-global-link-hover-color; + color: $global-link-hover-color; background-color: transparent; } .dark-theme & { - color: $dark-global-link-color; + color: $global-link-color-dark; text-decoration: none; transition: color 0.2s ease, border-color 0.2s ease, background 0.2s ease, opacity 0.2s ease; &:hover { - color: $dark-global-link-hover-color; + color: $global-link-hover-color-dark; text-decoration: none; transition: color 0.2s ease, border-color 0.2s ease, background 0.2s ease, opacity 0.2s ease; } @@ -61,10 +61,10 @@ .archive-item-date { float: right; text-align: right; - color: $light-font-secondary-color; + color: $global-font-secondary-color; .dark-theme & { - color: $dark-font-secondary-color; + color: $global-font-secondary-color-dark; } } diff --git a/assets/css/_partial/footer.scss b/assets/css/_partial/_footer.scss similarity index 98% rename from assets/css/_partial/footer.scss rename to assets/css/_partial/_footer.scss index 3654ae06..ec85515f 100644 --- a/assets/css/_partial/footer.scss +++ b/assets/css/_partial/_footer.scss @@ -21,7 +21,7 @@ text-shadow: 0 1px 0 #333; font-weight: bold; padding: 17px 16px; - border: 1px solid $light-border-color; + border: 1px solid $global-border-color; background: #222; &:hover { background: #000; @@ -44,6 +44,6 @@ } .dark-theme &{ - border: 1px solid $dark-border-color; + border: 1px solid $global-border-color-dark; } } diff --git a/assets/css/_partial/navbar.scss b/assets/css/_partial/_navbar.scss similarity index 77% rename from assets/css/_partial/navbar.scss rename to assets/css/_partial/_navbar.scss index 1e915590..fc88ac44 100644 --- a/assets/css/_partial/navbar.scss +++ b/assets/css/_partial/_navbar.scss @@ -6,7 +6,6 @@ } } - .navbar .menu a { padding: 0 8px; @@ -14,10 +13,10 @@ .navbar .menu .active { font-weight: 900; - color: $light-navbar-active-color; + color: $navbar-active-color; .dark-theme & { - color: $dark-navbar-active-color; + color: $navbar-active-color-dark; } } @@ -26,3 +25,5 @@ background-color: transparent; } + + diff --git a/assets/css/_partial/pagination.scss b/assets/css/_partial/_pagination.scss similarity index 79% rename from assets/css/_partial/pagination.scss rename to assets/css/_partial/_pagination.scss index af94cbaf..d1453d24 100644 --- a/assets/css/_partial/pagination.scss +++ b/assets/css/_partial/_pagination.scss @@ -32,11 +32,11 @@ } &:hover a { - color: $light-pagination-link-active-color; + color: $pagination-link-active-color; } .dark-theme &:hover a { - color: $dark-pagination-link-active-color; + color: $pagination-link-active-color-dark; } &:before, @@ -45,14 +45,14 @@ content: ""; width: 0; height: 3px; - background: $light-pagination-link-active-color; + background: $pagination-link-active-color; transition: 0.3s; bottom: 0px; } .dark-theme &:before, .dark-theme &:after { - background: $dark-pagination-link-active-color; + background: $pagination-link-active-color-dark; } &:before .active, @@ -78,11 +78,11 @@ &.active { a { - color: $light-pagination-link-active-color; + color: $pagination-link-active-color; } .dark-theme & a { - color: $dark-pagination-link-active-color; + color: $pagination-link-active-color-dark; } &:before, diff --git a/assets/css/_partial/_post/_admonition.scss b/assets/css/_partial/_post/_admonition.scss new file mode 100644 index 00000000..d571afda --- /dev/null +++ b/assets/css/_partial/_post/_admonition.scss @@ -0,0 +1,200 @@ +.admonition { + box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), + 0 1px 5px 0 rgba(0,0,0,.12), + 0 3px 1px -2px rgba(0,0,0,.2); + position: relative; + margin: .9765em 0; + padding: 0 .75rem; + border-left: .25rem solid #448aff; + border-radius: .125rem; + overflow: auto; + + .admonition-title { + margin: 0 -0.75rem; + padding: .5rem .75rem .5rem 2.5rem; + border-bottom: .1rem solid rgba(68,138,255,.1); + background-color: rgba(68,138,255,.1); + font-weight: 700; + } + + i.icon { + font-size: 16px; + cursor: auto; + position: absolute; + left: .75rem; + top: .75rem; + } + + &.note { + border-left-color: #448aff; + + i.icon { + color: #448aff; + } + } + + &.abstract { + border-left-color: #00b0ff; + + .admonition-title { + background-color: rgba(0,176,255,.1); + } + + i.icon { + color: #00b0ff; + } + } + + &.info { + border-left-color: #00b8d4; + + .admonition-title { + background-color: rgba(0,184,212,.1); + } + + i.icon { + color: #00b8d4; + } + } + + &.tip { + border-left-color: #00bfa5; + + .admonition-title { + background-color: rgba(0,191,165,.1); + } + + i.icon { + color: #00bfa5; + } + } + + &.success { + border-left-color: #00c853; + + .admonition-title { + background-color: rgba(0,200,83,.1); + } + + i.icon { + color: #00c853; + } + } + + &.question { + border-left-color: #64dd17; + + .admonition-title { + background-color: rgba(100,221,23,.1); + } + + i.icon { + color: #64dd17; + } + } + + &.warning { + border-left-color: #ff9100; + + .admonition-title { + background-color: rgba(255,145,0,.1); + } + + i.icon { + color: #ff9100; + } + } + + &.failure { + border-left-color: #ff5252; + + .admonition-title { + background-color: rgba(255,82,82,.1); + } + + i.icon { + color: #ff5252; + } + } + + &.danger { + border-left-color: #ff1744; + + .admonition-title { + background-color: rgba(255,23,68,.1); + } + + i.icon { + color: #ff1744; + } + } + + &.bug { + border-left-color: #f50057; + + .admonition-title { + background-color: rgba(245,0,87,.1); + } + + i.icon { + color: #f50057; + } + } + + &.example { + border-left-color: #651fff; + + .admonition-title { + background-color: rgba(101,31,255,.1); + } + + i.icon { + color: #651fff; + } + } + + &.quote { + border-left-color: #9e9e9e; + + .admonition-title { + background-color: hsla(0,0%,62%,.1); + } + + i.icon { + color: #9e9e9e; + } + } + + &:last-child { + margin-bottom: .75rem; + } +} + +details.admonition { + summary { + display: block; + outline: none; + cursor: pointer; + + &::-webkit-details-marker { + display: none; + } + + i.details { + position: absolute; + top: .75rem; + right: .75rem; + color: $global-font-color; + + .dark-theme & { + color: $global-font-color-dark; + } + } + } +} + +details.admonition[open] { + i.details { + transform: rotate(180deg); + } +} diff --git a/assets/css/_partial/post/code.scss b/assets/css/_partial/_post/_code.scss similarity index 62% rename from assets/css/_partial/post/code.scss rename to assets/css/_partial/_post/_code.scss index 7d2f0887..98224e59 100644 --- a/assets/css/_partial/post/code.scss +++ b/assets/css/_partial/_post/_code.scss @@ -13,11 +13,11 @@ pre { code { padding: 3px 5px; border-radius: 4px; - color: $l-code-color; + color: $code-color; background: $l-code-background; .dark-theme & { - color: $d-code-color; + color: $code-color-dark; background: $d-code-background; } } @@ -26,7 +26,7 @@ p > code { background: darken($l-code-background, 3%); .dark-theme & { - color: $d-code-color; + color: $code-color-dark; background: darken($d-code-background, 3%); } } @@ -55,7 +55,7 @@ p > code { padding: 2px 7px; font-size: $code-font-size; font-weight: bold; - color: darken($gray, 10%); + color: darken($code-info-color, 10%); background: darken($l-code-background, 3%); content: 'Code'; @@ -107,7 +107,7 @@ p > code { } } - /* LineNumbersTable */ .lnt { color: $gray; } + /* LineNumbersTable */ .lnt { color: $code-info-color; } /* LineHighlight */ .hl { display: block; width: 100%; background-color: #ffffcc } /* P */ .chroma .p { color: #A9A9B3 } @@ -186,59 +186,59 @@ p > code { background: $d-code-background; /* Keyword */ .chroma .k { color: #D371E3 } - /* KeywordConstant */ .chroma .kc { color: #D371E3 } - /* KeywordDeclaration */ .chroma .kd { color: #D371E3 } - /* KeywordNamespace */ .chroma .kn { color: #D371E3 } - /* KeywordPseudo */ .chroma .kp { color: #D371E3 } - /* KeywordReserved */ .chroma .kr { color: #D371E3 } - /* KeywordType */ .chroma .kt { color: #8be9fd } - /* NameAttribute */ .chroma .na { color: #41B1F5 } - /* NameBuiltin */ .chroma .nb { color: #8be9fd; font-style: italic } - /* NameClass */ .chroma .nc { color: #E5BF78 } - /* NameFunction */ .chroma .nf { color: #19B8C0 } - /* NameX */ .chroma .nx { color: #F16473 } - /* NameLabel */ .chroma .nl { color: #8be9fd; font-style: italic } - /* NameTag */ .chroma .nt { color: #D371E3 } - /* NameVariable */ .chroma .nv { color: #8be9fd; font-style: italic } - /* NameVariableClass */ .chroma .vc { color: #8be9fd; font-style: italic } - /* NameVariableGlobal */ .chroma .vg { color: #8be9fd; font-style: italic } - /* NameVariableInstance */ .chroma .vi { color: #8be9fd; font-style: italic } - /* LiteralString */ .chroma .s { color: #8BC56F } - /* LiteralStringAffix */ .chroma .sa { color: #8BC56F } - /* LiteralStringBacktick */ .chroma .sb { color: #8BC56F } - /* LiteralStringChar */ .chroma .sc { color: #8BC56F } - /* LiteralStringDelimiter */ .chroma .dl { color: #8BC56F } - /* LiteralStringDoc */ .chroma .sd { color: #8BC56F } - /* LiteralStringDouble */ .chroma .s2 { color: #8BC56F } - /* LiteralStringEscape */ .chroma .se { color: #8BC56F } - /* LiteralStringHeredoc */ .chroma .sh { color: #8BC56F } - /* LiteralStringInterpol */ .chroma .si { color: #8BC56F } - /* LiteralStringOther */ .chroma .sx { color: #8BC56F } - /* LiteralStringRegex */ .chroma .sr { color: #8BC56F } - /* LiteralStringSingle */ .chroma .s1 { color: #8BC56F } - /* LiteralStringSymbol */ .chroma .ss { color: #8BC56F } - /* LiteralNumber */ .chroma .m { color: #bd93f9 } - /* LiteralNumberBin */ .chroma .mb { color: #bd93f9 } - /* LiteralNumberFloat */ .chroma .mf { color: #bd93f9 } - /* LiteralNumberHex */ .chroma .mh { color: #bd93f9 } - /* LiteralNumberInteger */ .chroma .mi { color: #bd93f9 } - /* LiteralNumberIntegerLong */ .chroma .il { color: #bd93f9 } - /* LiteralNumberOct */ .chroma .mo { color: #bd93f9 } - /* Operator */ .chroma .o { color: #D371E3 } - /* OperatorWord */ .chroma .ow { color: #D371E3 } - /* Comment */ .chroma .c { color: #7E848F } - /* CommentHashbang */ .chroma .ch { color: #7E848F } - /* CommentMultiline */ .chroma .cm { color: #7E848F } - /* CommentSingle */ .chroma .c1 { color: #7E848F } - /* CommentSpecial */ .chroma .cs { color: #7E848F } - /* CommentPreproc */ .chroma .cp { color: #D371E3 } - /* CommentPreprocFile */ .chroma .cpf { color: #D371E3 } - /* GenericDeleted */ .chroma .gd { color: #8b080b } - /* GenericEmph */ .chroma .ge { text-decoration: underline } - /* GenericHeading */ .chroma .gh { font-weight: bold } - /* GenericInserted */ .chroma .gi { font-weight: bold } - /* GenericOutput */ .chroma .go { color: #44475a } - /* GenericSubheading */ .chroma .gu { font-weight: bold } - /* GenericUnderline */ .chroma .gl { text-decoration: underline } + /* KeywordConstant */ .chroma .kc { color: #D371E3 } + /* KeywordDeclaration */ .chroma .kd { color: #D371E3 } + /* KeywordNamespace */ .chroma .kn { color: #D371E3 } + /* KeywordPseudo */ .chroma .kp { color: #D371E3 } + /* KeywordReserved */ .chroma .kr { color: #D371E3 } + /* KeywordType */ .chroma .kt { color: #8be9fd } + /* NameAttribute */ .chroma .na { color: #41B1F5 } + /* NameBuiltin */ .chroma .nb { color: #8be9fd; font-style: italic } + /* NameClass */ .chroma .nc { color: #E5BF78 } + /* NameFunction */ .chroma .nf { color: #19B8C0 } + /* NameX */ .chroma .nx { color: #F16473 } + /* NameLabel */ .chroma .nl { color: #8be9fd; font-style: italic } + /* NameTag */ .chroma .nt { color: #D371E3 } + /* NameVariable */ .chroma .nv { color: #8be9fd; font-style: italic } + /* NameVariableClass */ .chroma .vc { color: #8be9fd; font-style: italic } + /* NameVariableGlobal */ .chroma .vg { color: #8be9fd; font-style: italic } + /* NameVariableInstance */ .chroma .vi { color: #8be9fd; font-style: italic } + /* LiteralString */ .chroma .s { color: #8BC56F } + /* LiteralStringAffix */ .chroma .sa { color: #8BC56F } + /* LiteralStringBacktick */ .chroma .sb { color: #8BC56F } + /* LiteralStringChar */ .chroma .sc { color: #8BC56F } + /* LiteralStringDelimiter */ .chroma .dl { color: #8BC56F } + /* LiteralStringDoc */ .chroma .sd { color: #8BC56F } + /* LiteralStringDouble */ .chroma .s2 { color: #8BC56F } + /* LiteralStringEscape */ .chroma .se { color: #8BC56F } + /* LiteralStringHeredoc */ .chroma .sh { color: #8BC56F } + /* LiteralStringInterpol */ .chroma .si { color: #8BC56F } + /* LiteralStringOther */ .chroma .sx { color: #8BC56F } + /* LiteralStringRegex */ .chroma .sr { color: #8BC56F } + /* LiteralStringSingle */ .chroma .s1 { color: #8BC56F } + /* LiteralStringSymbol */ .chroma .ss { color: #8BC56F } + /* LiteralNumber */ .chroma .m { color: #bd93f9 } + /* LiteralNumberBin */ .chroma .mb { color: #bd93f9 } + /* LiteralNumberFloat */ .chroma .mf { color: #bd93f9 } + /* LiteralNumberHex */ .chroma .mh { color: #bd93f9 } + /* LiteralNumberInteger */ .chroma .mi { color: #bd93f9 } + /* LiteralNumberIntegerLong */ .chroma .il { color: #bd93f9 } + /* LiteralNumberOct */ .chroma .mo { color: #bd93f9 } + /* Operator */ .chroma .o { color: #D371E3 } + /* OperatorWord */ .chroma .ow { color: #D371E3 } + /* Comment */ .chroma .c { color: #7E848F } + /* CommentHashbang */ .chroma .ch { color: #7E848F } + /* CommentMultiline */ .chroma .cm { color: #7E848F } + /* CommentSingle */ .chroma .c1 { color: #7E848F } + /* CommentSpecial */ .chroma .cs { color: #7E848F } + /* CommentPreproc */ .chroma .cp { color: #D371E3 } + /* CommentPreprocFile */ .chroma .cpf { color: #D371E3 } + /* GenericDeleted */ .chroma .gd { color: #8b080b } + /* GenericEmph */ .chroma .ge { text-decoration: underline } + /* GenericHeading */ .chroma .gh { font-weight: bold } + /* GenericInserted */ .chroma .gi { font-weight: bold } + /* GenericOutput */ .chroma .go { color: #44475a } + /* GenericSubheading */ .chroma .gu { font-weight: bold } + /* GenericUnderline */ .chroma .gl { text-decoration: underline } } } diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss index 06938d91..188d83cc 100644 --- a/assets/css/_variables.scss +++ b/assets/css/_variables.scss @@ -1,73 +1,52 @@ -/** light theme **/ +// ============================== +// Variables +// ============================== -$light-background-color: #fff; +// ========== Global ========== // +// Background color of the body +$global-background-color: #fff !default; +$global-background-color-dark: #292a2d !default; -$light-font-color: #161209; -$light-font-secondary-color: #a9a9b3; +// Text color of the body. +$global-font-color: #161209 !default; +$global-font-color-dark: #a9a9b3 !default; -$light-navbar-active-color: #161209; +$global-font-secondary-color: #a9a9b3 !default; +$global-font-secondary-color-dark: #87878d !default; -$light-global-link-color: #161209; -$light-global-link-hover-color:#2d96bd; +$global-link-color: #161209 !default; +$global-link-color-dark: #a9a9b3 !default; +$global-link-hover-color:#2d96bd !default; +$global-link-hover-color-dark:#fff !default; -$light-post-link-color: #2d96bd; -$light-post-link-hover-color:#ef3982; +$global-border-color: #dcdcdc !default; +$global-border-color-dark: #4a4b50 !default; -$light-pagination-link-color : #2d96bd; -$light-pagination-link-active-color: #000; +$navbar-active-color: #161209 !default; +$navbar-active-color-dark: #fff !default; -$light-border-color: #dcdcdc; +$post-link-color: #2d96bd !default; +$post-link-color-dark: #eee !default; +$post-link-hover-color: #ef3982 !default; +$post-link-hover-color-dark: #fff !default; -/** dark theme **/ - -$dark-background-color: #292a2d; - -$dark-font-color: #a9a9b3; -$dark-font-secondary-color: #87878d; - -$dark-navbar-active-color: #fff; - -$dark-global-link-color: #a9a9b3; -$dark-global-link-hover-color:#fff; - -$dark-post-link-color: #eee; -$dark-post-link-hover-color:#fff; - -$dark-pagination-link-color : #a9a9b3; -$dark-pagination-link-active-color: #fff; - -$dark-border-color: #4a4b50; - -// ========== Color ========== // -$black: #0a0a0a !default; -$white: #fefefe !default; -$light-gray: #e6e6e6 !default; -$gray: #cacaca !default; -$dark-gray: #8a8a8a !default; +$pagination-link-color: #2d96bd !default; +$pagination-link-color-dark: #a9a9b3 !default; +$pagination-link-active-color: #000 !default; +$pagination-link-active-color-dark: #fff !default; // ========== Code ========== // // Color of the code. -$l-code-color: #E74C3C !default; -$d-code-color: #E5BF78 !default; +$code-color: #E74C3C !default; +$code-color-dark: #E5BF78 !default; + +$code-info-color: #cacaca !default; // Font size of code. -$code-font-size: 13px !default; +$code-font-size: 14px !default; // Font family of the code. -$code-font-family: Consolas, Monaco, Menlo, "DejaVu Sans Mono", - "Bitstream Vera Sans Mono", "Courier New", monospace !default; - -// Color of code highlight, solarized. -$code-highlight-color: ( - comment: #93a1a1, - keyword: #859900, - number: #2aa198, - title: #268bd2, - attribute: #b58900, - symbol: #cb4b16, - built_in: #dc322f, - formula: #eee8d5 -) !default; +$code-font-family: Consolas, Monaco, Menlo, "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace !default; // Code type list. $code-type-list: ( @@ -94,7 +73,6 @@ $code-type-list: ( language-ruby: "Ruby", language-sql: "SQL", language-shell: "Shell", - language-erlang: "Erlang", language-go: "Go", language-go-html-template: "Go HTML Template", diff --git a/assets/css/style.scss b/assets/css/style.scss index f6d4afb6..101b628f 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -1,7 +1,6 @@ +@import "_custom"; @import "_variables"; -@import "_iconfont"; - @import "_core/normalize"; @import "_core/base"; @import "_core/layout"; @@ -17,4 +16,3 @@ @import "_partial/pagination"; @import "_core/media"; -@import "_custom"; diff --git a/assets/fonts/iconfont/iconfont.eot b/assets/fonts/iconfont/iconfont.eot deleted file mode 100644 index 67fc843b..00000000 Binary files a/assets/fonts/iconfont/iconfont.eot and /dev/null differ diff --git a/assets/fonts/iconfont/iconfont.js b/assets/fonts/iconfont/iconfont.js deleted file mode 100644 index e34671f0..00000000 --- a/assets/fonts/iconfont/iconfont.js +++ /dev/null @@ -1 +0,0 @@ -!function(h){var t,c='',l=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss");if(l&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(t){console&&console.log(t)}}!function(t){if(document.addEventListener)if(~["complete","loaded","interactive"].indexOf(document.readyState))setTimeout(t,0);else{var l=function(){document.removeEventListener("DOMContentLoaded",l,!1),t()};document.addEventListener("DOMContentLoaded",l,!1)}else document.attachEvent&&(c=t,o=h.document,a=!1,i=function(){a||(a=!0,c())},(q=function(){try{o.documentElement.doScroll("left")}catch(t){return void setTimeout(q,50)}i()})(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,i())});var c,o,a,i,q}(function(){var t,l;(t=document.createElement("div")).innerHTML=c,c=null,(l=t.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",function(t,l){l.firstChild?function(t,l){l.parentNode.insertBefore(t,l)}(t,l.firstChild):l.appendChild(t)}(l,document.body))})}(window); \ No newline at end of file diff --git a/assets/fonts/iconfont/iconfont.svg b/assets/fonts/iconfont/iconfont.svg deleted file mode 100644 index 473d7199..00000000 --- a/assets/fonts/iconfont/iconfont.svg +++ /dev/null @@ -1,209 +0,0 @@ - - - - - -Created by iconfont - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/fonts/iconfont/iconfont.ttf b/assets/fonts/iconfont/iconfont.ttf deleted file mode 100644 index 6d75545d..00000000 Binary files a/assets/fonts/iconfont/iconfont.ttf and /dev/null differ diff --git a/assets/fonts/iconfont/iconfont.woff b/assets/fonts/iconfont/iconfont.woff deleted file mode 100644 index c0047808..00000000 Binary files a/assets/fonts/iconfont/iconfont.woff and /dev/null differ diff --git a/assets/fonts/iconfont/iconfont.woff2 b/assets/fonts/iconfont/iconfont.woff2 deleted file mode 100644 index a16a19e4..00000000 Binary files a/assets/fonts/iconfont/iconfont.woff2 and /dev/null differ diff --git a/assets/js/main.js b/assets/js/main.js index 71113f86..a4ff793b 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -44,7 +44,7 @@ jQuery(function($) { _Blog.countdown = function() { if (window.countdownMap) { - for (let id in countdownMap) { + Object.keys(countdownMap).forEach(function(id) { $(id).countdown(countdownMap[id], {elapse: true}) .on('update.countdown', function(event) { var $this = $(this).html(event.strftime('' @@ -53,35 +53,29 @@ jQuery(function($) { + '%M 分 ' + '%S 秒')); }); - } + }); } }; _Blog.typeit = function() { - if (window.typeitMap) { - for (let id in typeitMap) { - if (Array.isArray(typeitMap[id])) { - const group = typeitMap[id]; - (function typeone (i) { - if (i === group.length - 1) { - new TypeIt(`#${group[i]}`, { - strings: document.getElementById(`r${group[i]}`).innerHTML, - }).go(); - return; - } - let instance = new TypeIt(`#${group[i]}`, { + if (window.typeitArr) { + for (let i = 0; i < typeitArr.length; i++) { + const group = typeitArr[i]; + (function typeone (i) { + if (i === group.length - 1) { + new TypeIt(`#${group[i]}`, { strings: document.getElementById(`r${group[i]}`).innerHTML, - afterComplete: () => { - instance.destroy(); - typeone(i + 1); - }, }).go(); - })(0); - } else { - new TypeIt(`#${id}`, { - strings: document.getElementById(`r${id}`).innerHTML, + return; + } + let instance = new TypeIt(`#${group[i]}`, { + strings: document.getElementById(`r${group[i]}`).innerHTML, + afterComplete: () => { + instance.destroy(); + typeone(i + 1); + }, }).go(); - } + })(0); } } }; diff --git a/i18n/en.toml b/i18n/en.toml index d5ddc6f0..6c62244d 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -34,8 +34,8 @@ other = "Theme - " # === partials/footer.html === # === posts/single.html === -[wrote] -other = "wrote on" +[included] +other = "included in" [wordCount] other = "about {{ .Count }} words" @@ -43,6 +43,9 @@ other = "about {{ .Count }} words" [readingTime] other = "{{ .Count }} min" +[pageviews] +other = " pageviews" + [author] other = "Author" diff --git a/i18n/zh.toml b/i18n/zh.toml index 739970e1..0a1df3ac 100644 --- a/i18n/zh.toml +++ b/i18n/zh.toml @@ -34,14 +34,17 @@ other = "主题 - " # === partials/footer.html === # === posts/single.html === -[wrote] -other = "创作于" +[included] +other = "收录于" [wordCount] other = "约 {{ .Count }} 字" [readingTime] -other = "预计阅读 {{ .Count }} 分钟" +other = "预计阅读 {{ .Count }} 分钟" + +[pageviews] +other = " 次阅读" [author] other = "作者" diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 8535fa53..bdc7387e 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -7,6 +7,7 @@ {{ partial "head.html" . }} {{ $style := resources.Get "css/style.scss" | resources.ToCSS | resources.Minify}} +
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 7de54830..9df73354 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -2,7 +2,9 @@ {{ define "content" }}
-

{{ .Title }}

+
+

{{ .Title }}

+
{{ .Content }}
diff --git a/layouts/index.atom.xml b/layouts/index.atom.xml index 6284faeb..e212cdbc 100644 --- a/layouts/index.atom.xml +++ b/layouts/index.atom.xml @@ -1,33 +1,37 @@ - {{ if .IsHome }} - {{ .Title }} - {{ else }} - {{ .Title }} - {{ .Site.Title }} - {{ end }} - - {{ if not .Date.IsZero }} - {{ .Date.Format "02-01-2006T15:04:05-07:00" | safeHTML }}{{ end }} - {{ .Permalink }} - - {{ with .Site.Author.name }} - {{ . }} + {{ if .IsHome }} + {{ .Title }} + {{ else }} + {{ .Title }} - {{ .Site.Title }} {{ end }} - {{ with $.Site.Author.email }} - {{ . }} - {{ end }} - - Hugo -- gohugo.io{{ range first 15 (where .Data.Pages "Type" "in" .Site.Params.mainSections) }} - - {{ `<![CDATA[` | safeHTML }}{{ .Title }}]]> + + {{ if not .Date.IsZero }} + {{ .Date.Format "02-01-2006T15:04:05-07:00" | safeHTML }} + {{ end }} {{ .Permalink }} - {{ with .Site.Author.Name }} - - {{ . }} - + + {{ with .Site.Author.name }} + {{ . }} + {{ end }} + {{ with $.Site.Author.email }} + {{ . }} + {{ end }} + + Hugo -- gohugo.io + {{ range first 15 (where .Data.Pages "Type" "in" .Site.Params.mainSections) }} + + {{ `<![CDATA[` | safeHTML }}{{ .Title }}]]> + + {{ .Permalink }} + {{ with .Site.Author.name }} + + {{ . }} + + {{ end }} + {{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }} + {{ .Lastmod.Format "2006-01-02T15:04:05-07:00" | safeHTML }} + {{ ` + {{ end }} - {{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }} - {{ .Lastmod.Format "2006-01-02T15:04:05-07:00" | safeHTML }} - {{ ` - {{ end }} diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html index b066e269..1ea0f135 100644 --- a/layouts/partials/comments.html +++ b/layouts/partials/comments.html @@ -5,14 +5,14 @@ @@ -26,40 +26,36 @@ {{- end -}} {{- if .Site.Params.valine.enable -}} - - pm - 1000000 -

-
- - + + {{- end -}} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 874e4e72..b1248d3b 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,14 +1,21 @@
+ {{ (printf (T "powered") `Hugo`) | safeHTML }} | {{ T "theme" }}LoveIt +
© - {{ with .Site.Params.since }} + {{- with .Site.Params.since -}} {{ if lt . now.Year }}{{ . }} - {{ end }}{{ now.Year }} - {{ else }} + {{- else -}} {{ now.Year }} - {{ end }} - {{ with .Site.Author.Name }} - {{ . }} | - {{ end }} - {{ (printf (T "powered") `Hugo`) | safeHTML }} | {{ T "theme" }}LoveIt -
+ {{- end -}} + {{- with .Site.Author.name -}} +  {{ . }} + {{- end -}} + {{- with .Site.Params.icp -}} +  | {{ . | safeHTML }} + {{- end -}} + {{- with .Site.Params.license -}} +  | {{ . | safeHTML }} + {{- end -}} +
diff --git a/layouts/partials/header.html b/layouts/partials/header.html index cc4d8c12..2451b0df 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -9,7 +9,7 @@ {{ range .Site.Menus.main }} {{ .Name }} {{ end }} -   +  
@@ -17,7 +17,7 @@