From 2653f1bc7cf20162d901a8625a993c01a433f91a Mon Sep 17 00:00:00 2001 From: Dillon Date: Sat, 17 Aug 2019 03:40:34 +0800 Subject: [PATCH] feat: fontawesome, admonition and faster --- assets/css/_core/_base.scss | 83 ++++++ .../css/_core/{layout.scss => _layout.scss} | 11 +- assets/css/_core/{media.scss => _media.scss} | 37 ++- .../_core/{normalize.scss => _normalize.scss} | 0 assets/css/_core/base.scss | 129 --------- assets/css/_iconfont.scss | 261 ------------------ assets/css/_page/{home.scss => _home.scss} | 4 +- .../_page/{home_post.scss => _home_post.scss} | 12 +- assets/css/_page/{post.scss => _post.scss} | 146 ++++++---- assets/css/_page/{tags.scss => _tags.scss} | 8 +- assets/css/_page/{terms.scss => _terms.scss} | 10 +- .../_partial/{footer.scss => _footer.scss} | 4 +- .../_partial/{navbar.scss => _navbar.scss} | 7 +- .../{pagination.scss => _pagination.scss} | 12 +- assets/css/_partial/_post/_admonition.scss | 200 ++++++++++++++ .../{post/code.scss => _post/_code.scss} | 118 ++++---- assets/css/_variables.scss | 90 +++--- assets/css/style.scss | 4 +- assets/fonts/iconfont/iconfont.eot | Bin 17064 -> 0 bytes assets/fonts/iconfont/iconfont.js | 1 - assets/fonts/iconfont/iconfont.svg | 209 -------------- assets/fonts/iconfont/iconfont.ttf | Bin 16896 -> 0 bytes assets/fonts/iconfont/iconfont.woff | Bin 11976 -> 0 bytes assets/fonts/iconfont/iconfont.woff2 | Bin 10332 -> 0 bytes assets/js/main.js | 40 ++- i18n/en.toml | 7 +- i18n/zh.toml | 9 +- layouts/_default/baseof.html | 1 + layouts/_default/single.html | 4 +- layouts/index.atom.xml | 58 ++-- layouts/partials/comments.html | 52 ++-- layouts/partials/footer.html | 23 +- layouts/partials/header.html | 4 +- layouts/partials/home/profile.html | 11 +- layouts/partials/home/social.html | 116 ++++---- layouts/partials/js.html | 24 +- layouts/partials/post/share-links.html | 49 ++-- layouts/posts/single.html | 77 +++--- layouts/posts/summary.html | 2 +- layouts/rss.xml | 8 +- layouts/shortcodes/admonition.html | 57 ++-- layouts/shortcodes/align-center.html | 7 +- layouts/shortcodes/align-left.html | 7 +- layouts/shortcodes/align-right.html | 7 +- layouts/shortcodes/countdown.html | 10 +- layouts/shortcodes/fa.html | 5 + layouts/shortcodes/float-right.html | 7 +- layouts/shortcodes/music.html | 3 +- layouts/shortcodes/typeit.html | 26 +- layouts/taxonomy/terms.html | 2 +- 50 files changed, 850 insertions(+), 1112 deletions(-) create mode 100644 assets/css/_core/_base.scss rename assets/css/_core/{layout.scss => _layout.scss} (84%) rename assets/css/_core/{media.scss => _media.scss} (76%) rename assets/css/_core/{normalize.scss => _normalize.scss} (100%) delete mode 100644 assets/css/_core/base.scss delete mode 100644 assets/css/_iconfont.scss rename assets/css/_page/{home.scss => _home.scss} (96%) rename assets/css/_page/{home_post.scss => _home_post.scss} (69%) rename assets/css/_page/{post.scss => _post.scss} (59%) rename assets/css/_page/{tags.scss => _tags.scss} (69%) rename assets/css/_page/{terms.scss => _terms.scss} (86%) rename assets/css/_partial/{footer.scss => _footer.scss} (98%) rename assets/css/_partial/{navbar.scss => _navbar.scss} (77%) rename assets/css/_partial/{pagination.scss => _pagination.scss} (79%) create mode 100644 assets/css/_partial/_post/_admonition.scss rename assets/css/_partial/{post/code.scss => _post/_code.scss} (62%) delete mode 100644 assets/fonts/iconfont/iconfont.eot delete mode 100644 assets/fonts/iconfont/iconfont.js delete mode 100644 assets/fonts/iconfont/iconfont.svg delete mode 100644 assets/fonts/iconfont/iconfont.ttf delete mode 100644 assets/fonts/iconfont/iconfont.woff delete mode 100644 assets/fonts/iconfont/iconfont.woff2 create mode 100644 layouts/shortcodes/fa.html diff --git a/assets/css/_core/_base.scss b/assets/css/_core/_base.scss new file mode 100644 index 000000000..b85d88d86 --- /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 6996b9a26..4a67d0fd9 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 756a6dd93..da57b0c4c 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 b2b4755a3..000000000 --- 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 833b6128e..000000000 --- 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 67f3bee89..d2e9a409a 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 49ddd47ab..1e5243a98 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 5e874da42..3c3c8fa64 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 960c781c5..9e466eae8 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 d0cd83e32..16bba2ac9 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 3654ae060..ec85515fa 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 1e915590d..fc88ac446 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 af94cbafa..d1453d246 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 000000000..d571afdae --- /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 7d2f08878..98224e59e 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 06938d91e..188d83cc1 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 f6d4afb6d..101b628f8 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 67fc843b433f5f4c6d2871cb9c4047ef05fbd690..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17064 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 E1~Q7G*#H0l diff --git a/assets/fonts/iconfont/iconfont.js b/assets/fonts/iconfont/iconfont.js deleted file mode 100644 index e34671f07..000000000 --- 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 473d71994..000000000 --- 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 6d75545d5d82998b15c1fb0229e42a7d2ee90eba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16896 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 diff --git a/assets/fonts/iconfont/iconfont.woff b/assets/fonts/iconfont/iconfont.woff deleted file mode 100644 index c0047808cb1b3e0d6de52abed765f046262f4446..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11976 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 分 ' + '%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 d5ddc6f02..6c62244d2 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 739970e1c..0a1df3acc 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 8535fa538..bdc7387ea 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 7de54830a..9df733545 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 6284faeb1..e212cdbc7 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 b066e2694..1ea0f1358 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 874e4e72f..b1248d3bd 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 cc4d8c12d..2451b0df4 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 @@