jekyll-text-theme 1.4.3 → 1.5.0

data/_layouts/page.html

@@ -1,12 +1,12 @@
 ---
-layout: blog-default
+layout: base
 ---
 <div class="m-page">
   <article class="main">
     {%- include snippets/page-title.html -%}
-    <h1>{{ __return }}</h1>
+    <div class="main-header"><h1>{{ __return }}</h1></div>
     <div class="m-article-content" itemprop="articleBody">{{ content }}</div>
-    {%- if page.comment != false -%}
+    {%- if jekyll.environment != "development" and page.comment != false -%}
       <section>{%- include utils/comment-disqus.html -%}</section>
       <section>{%- include utils/comment-gitalk.html -%}</section>
     {%- endif -%}

data/_layouts/post.html

@@ -1,15 +1,18 @@
 ---
-layout: blog-default
+layout: base
 ---
 <div class="m-post">
-	<div class="main js-main">
+	<div class="main clearfix js-main">
+		<div class="col-2 js-col-2">
+			<aside class="js-article-aside"><div class="m-toc js-toc"></div></aside>
+		</div>
 		<div class="col-1">
-			<article itemscope itemtype="http://schema.org/BlogPosting">
+			<article class="js-article" itemscope itemtype="http://schema.org/BlogPosting">
 				<meta itemprop="mainEntityOfPage" itemscope itemType="https://schema.org/WebPage"/>
-				<header class="article-header">
+				<header class="main-header">
 					{%- include snippets/page-title.html -%}
 					<h1 itemprop="headline" itemprop="name headline">{{ __return }}</h1>
-					{%- include blog/article-data.html -%}
+					{%- include components/article-data.html -%}
 				</header>
 				<div class="m-article-content js-article-content" itemprop="articleBody">{{ content }}</div>
 				<footer>
@@ -26,175 +29,32 @@ layout: blog-default
 						<meta itemprop="dateModified" content="{{ page.date | date_to_xmlschema }}">
 					{%- endif -%}
 					<div class="article-license">
-						{%- include blog/license.html -%}
+						{%- include components/license.html -%}
 					</div>
 				</footer>
-				{%- if page.comment != false -%}
-					<section>{%- include utils/comment-disqus.html -%}</section>
-					<section>{%- include utils/comment-gitalk.html -%}</section>
-				{%- endif -%}
 			</article>
-		</div>
-		<div class="col-2">
-			<aside class="js-article-aside"><div class="m-toc js-toc"></div></aside>
+			<div class="article-previous-next clearfix">
+				{%- if page.next -%}
+					{%- assign __path = page.next.url -%}
+					{%- include snippets/prepend-baseurl.html -%}
+					{%- assign href = __return -%}
+					{%- assign __locale = site.data.locale.PREVIOUS -%}
+					{%- include snippets/locale-to-string.html -%}
+					<div class="article-previous"><span>{{ __return }}</span><a href="{{ href }}">{{ page.next.title }}</a></div>
+				{%- endif -%}
+				{%- if page.previous -%}
+					{%- assign __path = page.previous.url -%}
+					{%- include snippets/prepend-baseurl.html -%}
+					{%- assign href = __return -%}
+					{%- assign __locale = site.data.locale.NEXT -%}
+					{%- include snippets/locale-to-string.html -%}
+					<div class="article-next"><span>{{ __return }}</span><a href="{{ href }}">{{ page.previous.title }}</a></div>
+				{%- endif -%}
+			</div>
+			{%- if jekyll.environment != "development" and page.comment != false -%}
+				<section>{%- include utils/comment-disqus.html -%}</section>
+				<section>{%- include utils/comment-gitalk.html -%}</section>
+			{%- endif -%}
 		</div>
 	</div>
-</div>
-
-<script src="//cdn.bootcss.com/toc/0.3.2/toc.min.js"></script>
-<script type="text/javascript">
-	window.throttle = function(func, wait) {
-	  var args, result, thisArg, timeoutId, lastCalled = 0;
-
-	  function trailingCall() {
-	    lastCalled = new Date;
-	    timeoutId = null;
-	    result = func.apply(thisArg, args);
-	  }
-	  return function() {
-	    var now = new Date,
-	      remaining = wait - (now - lastCalled);
-
-	    args = arguments;
-	    thisArg = this;
-
-	    if (remaining <= 0) {
-	      clearTimeout(timeoutId);
-	      timeoutId = null;
-	      lastCalled = now;
-	      result = func.apply(thisArg, args);
-	    } else if (!timeoutId) {
-	      timeoutId = setTimeout(trailingCall, remaining);
-	    }
-	    return result;
-	  };
-	}
-	$(function() {
-	  var $window = $(window);
-	  var $pageStage = $('.js-page-stage');
-	  var $pageMain = $('.js-main');
-	  var $pageFooter = $('.js-page-footer');
-	  var $articleContent = $('.js-article-content');
-	  var $articleAside = $('.js-article-aside');
-	  var $toc = $('.js-toc');
-	  var hasTitle = $articleContent.find('h1, h2, h3').length > 0;
-
-	  function asideSticky() {
-	    return $window.outerWidth() > 1150 && $pageStage.hasClass('has-toc');
-	  }
-
-	  function setTocClass() {
-	    if (hasTitle) {
-	      !$pageStage.hasClass('has-toc') && $pageStage.addClass('has-toc');
-	    }
-	  }
-
-	  setTocClass();
-
-	  function setAsideTOC() {
-	    var asideTop, asideLeft, scrollBottom, asideBottomTop, lastScrollTop;
-
-	    function init() {
-	      var asideOffset = $articleAside.offset();
-	      var footerOffset = $pageFooter.offset();
-	      var mainOffset = $pageMain.offset();
-	      asideTop = mainOffset.top;
-	      asideHeight = $toc.outerHeight() + parseInt($articleAside.css('padding-top'), 10) + parseInt($articleAside.css('padding-bottom'), 10);
-	      asideLeft = mainOffset.left + $pageMain.outerWidth() - $articleAside.outerWidth() - parseInt($pageMain.css('padding-right'), 10);
-	      scrollBottom = footerOffset.top - asideHeight;
-	      asideBottomTop = scrollBottom - mainOffset.top;
-	    }
-
-	    function setAside(force) {
-	      force !== true && (force = false);
-	      var scrollTop = $window.scrollTop();
-	      if (scrollTop >= asideTop && scrollTop <= scrollBottom) {
-	        (!force && lastScrollTop >= asideTop && lastScrollTop <= scrollBottom) ||
-	        $articleAside.addClass('fixed').css({
-	          left: asideLeft + 'px',
-	          top: 0
-	        });
-	      } else if (scrollTop < asideTop) {
-	        (!force && lastScrollTop < asideTop) ||
-	        $articleAside.removeClass('fixed').css({
-	          left: 0,
-	          top: 0
-	        });
-	      } else {
-	        (!force && lastScrollTop > scrollBottom) ||
-	        $articleAside.removeClass('fixed').css({
-	          left: 0,
-	          top: asideBottomTop + 'px'
-	        });
-	      }
-	      lastScrollTop = scrollTop;
-	    }
-	    asideSticky() && (init(), setAside());
-	    $window.on('scroll', function() {
-	      asideSticky() && setAside();
-	    });
-	    $window.on('resize', throttle(function() {
-	      setTocClass();
-	      asideSticky() && (init(), setAside(true));
-	    }, 100));
-	    setTimeout(init, 4000);
-	  }
-	  setTimeout(setAsideTOC, 1000);
-
-	  $toc.toc({
-	    'selectors': 'h1,h2,h3',
-	    'container': '.js-article-content',
-	  });
-	});
-</script>
-{%- if page.key and site.leancloud.app_id and site.leancloud.app_key and site.leancloud.app_class and site.isdebug == false -%}
-  <script src="//cdn1.lncld.net/static/js/3.4.1/av-min.js"></script>
-  <script type="text/javascript">
-		$(function() {
-			// 初始化
-			AV.init({
-				appId: '{{ site.leancloud.app_id }}',
-				appKey: '{{ site.leancloud.app_key }}'
-			});
-			// 查询
-			var query = new AV.Query('{{ site.leancloud.app_class }}');
-			query.equalTo('key', '{{ page.key }}');
-			query.first().then(function(result) {
-				if (result) {
-					addOne(result)
-				} else {
-					//新建
-					var Blog = AV.Object.extend('{{ site.leancloud.app_class }}');
-					var blog = new Blog();
-					blog.set('title', '{{ page.title }}');
-					blog.set('key', '{{ page.key }}');
-					blog.set('views', 0);
-					blog.save().then(function(page) {
-						addOne(page)
-					}, function(error) {
-						if (error) {
-							throw error;
-						}
-					});
-				}
-
-				function addOne(page) {
-					page.increment('views', 1);
-					page.save(null, {
-						fetchWhenSave: true
-					}).then(function(page) {
-						$("#post-key-{{ page.key }}").text(page.attributes.views);
-					}, function(error) {
-						if (error) {
-							throw error;
-						}
-					});
-				}
-			}, function(error) {
-				if (error) {
-					throw error;
-				}
-			});
-		});
-	</script>
-{%- endif -%}
+</div>

data/_sass/animate/_fade-in-down.scss

@@ -0,0 +1,10 @@
+@keyframes fade-in-down {
+  from {
+    opacity: 0;
+    @include transform(translateY(-2rem));
+  }
+  to {
+    opacity: 1;
+    @include transform(translateY(0));
+  }
+}

data/_sass/animate/_fade-in.scss

@@ -0,0 +1,8 @@
+@keyframes fade-in {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}

data/_sass/colors/{_colors.chocolate.scss → _chocolate.scss}

@@ -20,13 +20,19 @@ $background-color: #f2ebe6;
 $text-color-d:     #251914;
 $text-color:       #3f2a21;
 $text-color-l:     #724c3c;
-$text-background-color:#e3d1ca;
+$text-background-color: rgba(#000, .05);
 
 // border and shadow colors
-$border-color:     #dcc6bd;
+$border-color:     mix(#000, $background-color, 20%);
+$border-color-l:   mix(#000, $background-color, 10%);
 $select-color:     rgba($main-color-3, .5);
 $decorate-color:   rgba(#000, .1);
-$shadow-color:     rgba(#000, .15);
+
+// function colors
+$green:           #57c22d;
+$blue:            #2593fc;
+$yellow:          #f8ac30;
+$red:             #f22635;
 
 // logo colors
 $mail-color:       #0072c5;

data/_sass/colors/{_colors.dark.scss → _dark.scss}

@@ -10,6 +10,7 @@ $text-color-1:     #dedede;
 
 $main-color-2:     #ff3366;
 $text-color-2:     #dedede;
+
 $main-color-3:     #21252b;
 $text-color-3:     #dedede;
 
@@ -19,13 +20,19 @@ $background-color: #2e3744;
 $text-color-d:     #f1f3f6;
 $text-color:       #dadfe6;
 $text-color-l:     #acb0b4;
-$text-background-color:#1e242d;
+$text-background-color: rgba(#fff, .05);
 
 // border and shadow colors
-$border-color:     #161b21;
+$border-color:     mix(#fff, $background-color, 20%);
+$border-color-l:   mix(#fff, $background-color, 10%);
 $select-color:     rgba($main-color-1, .5);
 $decorate-color:   rgba(#fff, .1);
-$shadow-color:     rgba(#000, .1);
+
+// function colors
+$green:           #98c379;
+$blue:            #56b6c2;
+$yellow:          #e5c07b;
+$red:             #e06c75;
 
 // logo colors
 $mail-color:       #0072c5;

data/_sass/colors/{_colors.default.scss → _default.scss}

@@ -12,7 +12,7 @@ $main-color-2:     #fca24d;
 $text-color-2:     #fff;
 
 $main-color-3:     #f2f2f2;
-$text-color-3:     #666;
+$text-color-3:     #333;
 
 // background colors
 $background-color: #fff;
@@ -20,13 +20,19 @@ $background-color: #fff;
 $text-color-d:     #111;
 $text-color:       #333;
 $text-color-l:     #9c9c9c;
-$text-background-color:#f2f2f2;
+$text-background-color: rgba(#000, .05);
 
 // border and shadow colors
-$border-color:     #aeaeae;
+$border-color:     mix(#000, $background-color, 20%);
+$border-color-l:   mix(#000, $background-color, 10%);
 $select-color:     rgba($main-color-1, .5);
 $decorate-color:   rgba(#000, .1);
-$shadow-color:     rgba(#000, .15);
+
+// function colors
+$green:           #57c22d;
+$blue:            #2593fc;
+$yellow:          #f8ac30;
+$red:             #f22635;
 
 // logo colors
 $mail-color:       #0072c5;

data/_sass/colors/{_colors.forest.scss → _forest.scss}

@@ -20,13 +20,19 @@ $background-color: #f8fcfb;
 $text-color-d:     #325f74;
 $text-color:       #3e758f;
 $text-color-l:     #619dbb;
-$text-background-color:#f2f2f2;
+$text-background-color: rgba(#000, .05);
 
 // border and shadow colors
-$border-color:     #eacfd3;
+$border-color:     mix(#000, $background-color, 20%);
+$border-color-l:   mix(#000, $background-color, 10%);
 $select-color:     rgba($main-color-1, .5);
 $decorate-color:   rgba(#bb6170, .15);
-$shadow-color:     rgba(#000, .15);
+
+// function colors
+$green:           #57c22d;
+$blue:            #2593fc;
+$yellow:          #f8ac30;
+$red:             #f22635;
 
 // logo colors
 $mail-color:       #0072c5;

data/_sass/colors/{_colors.ocean.scss → _ocean.scss}

@@ -20,13 +20,19 @@ $background-color: #f5fcff;
 $text-color-d:     #32434c;
 $text-color:       #00537f;
 $text-color-l:     #0079ba;
-$text-background-color:#f2f2f2;
+$text-background-color: rgba(#000, .05);
 
 // border and shadow colors
-$border-color:     #aeaeae;
+$border-color:     mix(#000, $background-color, 20%);
+$border-color-l:   mix(#000, $background-color, 10%);
 $select-color:     rgba($main-color-1, .5);
 $decorate-color:   rgba(#000, .1);
-$shadow-color:     rgba(#000, .15);
+
+// function colors
+$green:           #57c22d;
+$blue:            #2593fc;
+$yellow:          #f8ac30;
+$red:             #f22635;
 
 // logo colors
 $mail-color:       #0072c5;

data/_sass/colors/{_colors.orange.scss → _orange.scss}

@@ -20,13 +20,19 @@ $background-color: #fff1eb;
 $text-color-d:     rgba(#000, .95);
 $text-color:       rgba(#000, .85);
 $text-color-l:     rgba(#000, .5);
-$text-background-color:rgba(#000, .05);
+$text-background-color: rgba(#000, .05);
 
 // border and shadow colors
-$border-color:     rgba(#000, .2);
+$border-color:     mix(#000, $background-color, 20%);
+$border-color-l:   mix(#000, $background-color, 10%);
 $select-color:     rgba($main-color-3, .5);
 $decorate-color:   rgba(#000, .1);
-$shadow-color:     rgba(#000, .15);
+
+// function colors
+$green:           #57c22d;
+$blue:            #2593fc;
+$yellow:          #f8ac30;
+$red:             #f22635;
 
 // logo colors
 $mail-color:       #0072c5;

data/_sass/common/_classes.scss

@@ -0,0 +1,15 @@
+@charset "utf-8";
+
+@import
+  "common/classes/animation",
+  "common/classes/clearfix",
+  "common/classes/flex",
+  "common/classes/link",
+  "common/classes/media",
+  "common/classes/shadow",
+  "common/classes/shape",
+  "common/classes/split-line",
+  "common/classes/transform",
+  "common/classes/transition",
+  "common/classes/user-select",
+  "common/classes/space"

data/_sass/{settings → common}/_highlighting.scss

@@ -1,18 +1,6 @@
 /**
  * Syntax highlighting styles
  */
-.m-article-content {
-  figure:before {
-    background-color: $text-background-color;
-  }
-  code, pre {
-    background-color: $text-background-color;
-  }
-  pre>code {
-    background-color: transparent;
-    color: $text-color;
-  }
-}
 
 .highlight {
   .c     { color: #998; font-style: italic } // Comment