jekyll-text-theme 1.4.3 → 1.5.0

data/_sass/layout/_default.scss

@@ -0,0 +1,19 @@
+.m-page-stage {
+  box-sizing: border-box;
+  min-height: 100%;
+  overflow: auto;
+  padding-bottom: map-get($layout, footer-height);
+  @include animation(fade-in-down map-get($animation, duration) map-get($animation, timing-function));
+}
+
+.m-page-content {
+  padding: 0;
+  padding-bottom: 1.6rem;
+  @include media-breakpoint-down(l) {
+    padding-bottom: 0.8rem;
+  }
+}
+
+.m-page-main {
+  margin: 0 auto;
+}

data/_sass/{blog/_page.error-404.scss → layout/_error-404.scss}

@@ -2,6 +2,6 @@
   @include flexbox;
   @include align-items(center);
   &>.main>h1 {
-    font-size: $base-font-size * 7;
+    font-size: 7rem;
   }
 }

data/_sass/layout/_home.scss

@@ -0,0 +1,61 @@
+.m-post-list {
+  & > article {
+    & > h1 {
+      font-size: map-get($base, font-size-header-list);
+      & > a {
+        @include link-text-colors( $text-color-d, $main-color-1, $main-color-1);
+      }
+    }
+    & > a {
+      font-size: map-get($base, font-size-sub);
+    }
+    padding-bottom: 1.3rem;
+    margin: 2.6rem 0 1rem 0;
+    &:not(:last-child) {
+      @include split-line(bottom);
+    }
+  }
+  .m-article-content {
+    font-size: map-get($base, font-size-sub);
+    line-height: map-get($base, line-height);
+    @include block-elements() {
+      margin-top: map-get($base, vertical-space);
+      margin-bottom: map-get($base, vertical-space);
+    }
+    @include heading-elements() {
+      margin-top: map-get($base, vertical-space) * 1.5;
+    }
+
+    h1,
+    h2,
+    h3 {
+      color: $text-color;
+    }
+    h1,
+    h2 {
+      padding: 0;
+      border: none;
+    }
+    h1 {
+      font-size: map-get($base, font-size-h1-excerpt);
+    }
+    h2 {
+      font-size: map-get($base, font-size-h2-excerpt);
+    }
+    h3 {
+      font-size: map-get($base, font-size-h3-excerpt);
+    }
+    h4 {
+      font-size: map-get($base, font-size-h4-excerpt);
+    }
+    h5 {
+      font-size: map-get($base, font-size-h5-excerpt);
+    }
+    h6 {
+      font-size: map-get($base, font-size-h6-excerpt);
+    }
+    img {
+      max-height: 12rem;
+    }
+  }
+}

data/_sass/layout/_post.scss

@@ -0,0 +1,80 @@
+.m-post {
+  .col-2 {
+    display: none;
+    float: right;
+    &>aside {
+      box-sizing: border-box;
+      width: map-get($layout, aside-width);
+      position: absolute;
+      padding: 1.5rem;
+      padding-right: 0;
+      overflow: hidden;
+    }
+    @include media-breakpoint-down(l) {
+      float: none;
+    }
+  }
+  footer {
+    &>span {
+      color: $text-color-l;
+    }
+    &>.article-license {
+      position: relative;
+      max-width: 30rem;
+      margin: .8rem 0;
+    }
+  }
+  .article-previous-next {
+    word-wrap: break-word;
+    margin: map-get($base, vertical-space-large) * 2 0 map-get($base, vertical-space-large) 0;
+    padding-top: map-get($base, vertical-space-large) / 2;
+    @include split-line(top, 4px);
+    & > .article-previous, & > .article-next {
+      box-sizing: border-box;
+      width: 50%;
+      & > span {
+        font-weight: map-get($base, font-weight-bold);
+        color: $text-color-l;
+      }
+      & > a{
+        display: block;
+        @include link-text-colors($text-color, $main-color-1, $main-color-1);
+      }
+    }
+    & > .article-previous {
+      float: left;
+      padding-right: .5rem;
+    }
+    & > .article-next {
+      float: right;
+      padding-left: .5rem;
+      text-align: right;
+    }
+  }
+}
+
+.has-toc {
+  .m-post {
+    .col-1 {
+      margin-right: map-get($layout, aside-width);
+      @include media-breakpoint-down(l) {
+        margin-right: 0;
+      }
+    }
+    .col-2 {
+      width: map-get($layout, aside-width);
+      position: relative;
+      display: block;
+      &>aside {
+        &.fixed {
+          position: fixed;
+          z-index: 2;
+          -webkit-font-smoothing: subpixel-antialiased;
+        }
+      }
+      @include media-breakpoint-down(l) {
+        display: none;
+      }
+    }
+  }
+}

data/assets/css/blog.scss

@@ -4,43 +4,38 @@
 @charset "utf-8";
 
 @import
-    "settings/base",
-    "settings/colors",
-    "settings/font",
-    "settings/highlighting",
-
-    "mixins/prefix",
-    "mixins/media",
-    "mixins/link",
-    "mixins/flex",
-    "mixins/shape",
-
-    "base/base",
-    "base/text",
-    "base/links",
-    "base/image&icon",
-    "base/animate",
-
-    "components/wrapper",
-
-    "components/follow-me",
-
+    "colors/{{ site.text_color_theme | default: site.data.variables.default.text_color_theme }}",
+    // "colors/chocolate",
+    // "colors/dark",
+    // "colors/default",
+    // "colors/forest",
+    // "colors/ocean",
+    // "colors/orange",
+
+    "common/variables",
+    "common/highlighting",
+    "common/classes",
+    "common/reset",
+    "common/components/button",
+
+    "animate/fade-in",
+    "animate/fade-in-down",
+
+    "components/main",
     "components/header",
-    "components/footer",
-
-    "components/toc",
-    "components/tags",
-    "components/pagination",
-
     "components/article.data",
     "components/article.content",
+    "components/article.content.extra",
+    "components/pagination",
+    "components/tags",
+    "components/toc",
+    "components/follow-me",
     "components/license",
+    "components/footer",
 
-    "blog/layout.base",
-    "blog/layout.default",
-    "blog/layout.post",
-
-    "blog/page.all",
-    "blog/page.index",
-    "blog/page.error-404"
+    "layout/default",
+    "layout/home",
+    "layout/all",
+    "layout/post",
+    "layout/error-404"
 ;

data/assets/images/logo/logo.svg

@@ -1,5 +1,5 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="24px" height="24px" viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+	 width="24px" height="24px" viewBox="0 0 24 24">
 <style type="text/css">
 	.st0{fill:#666666;}
 </style>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-text-theme
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - kitian616
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-13 00:00:00.000000000 Z
+date: 2018-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -118,17 +118,22 @@ files:
 - LICENSE
 - README.md
 - _data/locale.yml
-- _includes/blog/article-data.html
-- _includes/blog/footer.html
-- _includes/blog/header.html
-- _includes/blog/license.html
-- _includes/blog/tags.html
+- _data/variables.yml
 - _includes/common-head.html
+- _includes/components/article-data.html
+- _includes/components/follow-me.html
+- _includes/components/footer.html
+- _includes/components/header.html
+- _includes/components/license.html
+- _includes/components/tags.html
 - _includes/head-icons-rel.html
-- _includes/icon/mail.svg
+- _includes/icon/clear.svg
+- _includes/icon/link.svg
 - _includes/icon/menu.svg
 - _includes/icon/next.svg
+- _includes/icon/omit.svg
 - _includes/icon/previous.svg
+- _includes/icon/search.svg
 - _includes/icon/social/behance.svg
 - _includes/icon/social/douban.svg
 - _includes/icon/social/facebook.svg
@@ -136,69 +141,82 @@ files:
 - _includes/icon/social/github.svg
 - _includes/icon/social/googleplus.svg
 - _includes/icon/social/linkedin.svg
+- _includes/icon/social/mail.svg
 - _includes/icon/social/pinterest.svg
 - _includes/icon/social/qq.svg
 - _includes/icon/social/twitter.svg
 - _includes/icon/social/weibo.svg
 - _includes/icon/social/weixin.svg
 - _includes/icon/social/zhihu.svg
-- _includes/info/follow-me.html
 - _includes/logo/logo.svg
+- _includes/scripts/all.html
+- _includes/scripts/common.html
+- _includes/scripts/data.html
+- _includes/scripts/home.html
+- _includes/scripts/page-post.html
+- _includes/scripts/post.html
+- _includes/scripts/utils.html
 - _includes/snippets/get-lang.html
 - _includes/snippets/get-nav-url.html
+- _includes/snippets/get-sources.html
 - _includes/snippets/locale-to-string.html
 - _includes/snippets/page-title.html
 - _includes/snippets/page-url.html
 - _includes/snippets/prepend-baseurl.html
+- _includes/utils/chart.html
 - _includes/utils/comment-disqus.html
 - _includes/utils/comment-gitalk.html
 - _includes/utils/google-analytics.html
 - _includes/utils/mathjax.html
 - _includes/utils/mermaid.html
 - _layouts/all.html
-- _layouts/blog-base.html
-- _layouts/blog-default.html
+- _layouts/base.html
 - _layouts/error-404.html
 - _layouts/home.html
 - _layouts/none.html
 - _layouts/page.html
 - _layouts/post.html
-- _sass/base/_animate.scss
-- _sass/base/_base.scss
-- _sass/base/_image&icon.scss
-- _sass/base/_links.scss
-- _sass/base/_text.scss
-- _sass/blog/_layout.base.scss
-- _sass/blog/_layout.default.scss
-- _sass/blog/_layout.post.scss
-- _sass/blog/_page.all.scss
-- _sass/blog/_page.error-404.scss
-- _sass/blog/_page.index.scss
-- _sass/colors/_colors.chocolate.scss
-- _sass/colors/_colors.dark.scss
-- _sass/colors/_colors.default.scss
-- _sass/colors/_colors.forest.scss
-- _sass/colors/_colors.ocean.scss
-- _sass/colors/_colors.orange.scss
+- _sass/animate/_fade-in-down.scss
+- _sass/animate/_fade-in.scss
+- _sass/colors/_chocolate.scss
+- _sass/colors/_dark.scss
+- _sass/colors/_default.scss
+- _sass/colors/_forest.scss
+- _sass/colors/_ocean.scss
+- _sass/colors/_orange.scss
+- _sass/common/_classes.scss
+- _sass/common/_highlighting.scss
+- _sass/common/_reset.scss
+- _sass/common/_variables.scss
+- _sass/common/classes/_animation.scss
+- _sass/common/classes/_clearfix.scss
+- _sass/common/classes/_flex.scss
+- _sass/common/classes/_link.scss
+- _sass/common/classes/_media.scss
+- _sass/common/classes/_shadow.scss
+- _sass/common/classes/_shape.scss
+- _sass/common/classes/_space.scss
+- _sass/common/classes/_split-line.scss
+- _sass/common/classes/_transform.scss
+- _sass/common/classes/_transition.scss
+- _sass/common/classes/_user-select.scss
+- _sass/common/components/_button.scss
+- _sass/components/_article.content.extra.scss
 - _sass/components/_article.content.scss
 - _sass/components/_article.data.scss
 - _sass/components/_follow-me.scss
 - _sass/components/_footer.scss
 - _sass/components/_header.scss
 - _sass/components/_license.scss
+- _sass/components/_main.scss
 - _sass/components/_pagination.scss
 - _sass/components/_tags.scss
 - _sass/components/_toc.scss
-- _sass/components/_wrapper.scss
-- _sass/mixins/_flex.scss
-- _sass/mixins/_link.scss
-- _sass/mixins/_media.scss
-- _sass/mixins/_prefix.scss
-- _sass/mixins/_shape.scss
-- _sass/settings/_base.scss
-- _sass/settings/_colors.scss
-- _sass/settings/_font.scss
-- _sass/settings/_highlighting.scss
+- _sass/layout/_all.scss
+- _sass/layout/_default.scss
+- _sass/layout/_error-404.scss
+- _sass/layout/_home.scss
+- _sass/layout/_post.scss
 - assets/css/blog.scss
 - assets/images/license-cc4.png
 - assets/images/logo/icon-120x120.png

data/_includes/blog/header.html

@@ -1,56 +0,0 @@
-<header class="m-page-header main clearfix">
-  {%- if site.paths.base -%}
-    {%- assign __path = site.paths.base -%}
-  {%- else -%}
-    {%- assign __path = '/' -%}
-  {%- endif -%}
-  {%- include snippets/get-nav-url.html -%}
-  {%- if site.title -%}
-    <a class="site-title" title="{%- if site.description -%}{{ site.description }}{%- endif -%}" href="{{ __return }}">{{ site.title }}</a>
-  {%- endif -%}
-  <div class="site-logo">
-    {%- include logo/logo.svg -%}
-  </div>
-  <nav>
-    <ul class="inline-list">
-      {%- if site.paths.home -%}
-        {%- assign __path = site.paths.home -%}
-      {%- else -%}
-        {%- assign __path = '/' -%}
-      {%- endif -%}
-      {%- include snippets/get-nav-url.html -%}
-      {%- assign href = __return -%}
-      {%- assign __locale = site.data.locale.NAV.HOME -%}
-      {%- include snippets/locale-to-string.html -%}
-      <li><a href="{{ href }}">{{ __return }}</a></li>
-      {%- if site.paths.all -%}
-        {%- assign __path = site.paths.all -%}
-      {%- else -%}
-        {%- assign __path = '/all.html' -%}
-      {%- endif -%}
-      {%- include snippets/get-nav-url.html -%}
-      {%- assign href = __return -%}
-      {%- assign __locale = site.data.locale.NAV.ALL -%}
-      {%- include snippets/locale-to-string.html -%}
-      <li><a href="{{ href }}">{{ __return }}</a></li>
-      {%- for list in site.nav_lists -%}
-        {%- assign __path = list.url -%}
-        {%- include snippets/get-nav-url.html -%}
-        {%- assign href = __return -%}
-        {%- assign __locale = list.titles -%}
-        {%- include snippets/locale-to-string.html -%}
-        <li><a href="{{ href }}">{%- if list.title -%}{{ list.title }}{%- else -%}{{ __return }}{%- endif -%}</a></li>
-      {%- endfor -%}
-      {%- if site.paths.rss -%}
-        {%- assign __path = site.paths.rss -%}
-      {%- else -%}
-        {%- assign __path = '/feed.xml' -%}
-      {%- endif -%}
-      {%- include snippets/get-nav-url.html -%}
-      {%- assign href = __return -%}
-      {%- assign __locale = site.data.locale.NAV.RSS -%}
-      {%- include snippets/locale-to-string.html -%}
-      <li><a type="application/rss+xml" href="{{ href }}">{{ __return }}</a></li>
-    </ul>
-  </nav>
-</header>