jekyll-theme-mdui 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2b24a63f42949e336458237f8c3214570ed90ee
-  data.tar.gz: 5f414a24f8d498536f0fc1616933951803fc77ef
+  metadata.gz: ab00294c8ea9ce48a3d14edc59e2fb1642136560
+  data.tar.gz: 973ad6cf99d1a30d767a412a6a0d7aebee648583
 SHA512:
-  metadata.gz: bac6f45897e5abf8cb04f1362ff83178e3387eff89058a8eb1327fbdabf3bd00e595f3ce8dbfdef0538679685ed7781e14f8e4cc5287ce66bab364f007fbf582
-  data.tar.gz: fa38d734e5a863d3f0f18f8f83ff891c33ebbaa39d8dc1f75eb3a424eb61761a62b062102494dd9319cbe83b008b60864248078f1c97ca9795840baf601ee04c
+  metadata.gz: 971edcdd246fdefe090aa15c7500ea8b05d1012622986f51ff90345eb1d7c37d8447baeceecbbc28d6eba86981054d21ab04b4f2e9c36a08ee305e730333a499
+  data.tar.gz: 95cbb8f7dfaa1423b2df9125f390c840bb28519b79d1e74ca5aeb107293b6c7aee383fec79bb21630b251a35eb57a808f8cb345e0c97b4ca4cb809ee633b00ac

data/README.md

@@ -4,7 +4,7 @@ A Jekyll theme based on mdui
 
 [demo](https://blog.kejun.space)
 
-[![Version](https://img.shields.io/badge/version-0.2.4-green.svg?style=flat-square)]()
+[![Version](https://img.shields.io/badge/version-0.3.0-green.svg?style=flat-square)]()
 [![Jekyll](https://img.shields.io/badge/Jekyll-3.4+-green.svg?style=flat-square)](https://jekyllrb.com/)
 [![Gem](https://img.shields.io/gem/dt/jekyll-theme-mdui.svg?style=flat-square)](https://rubygems.org/gems/jekyll-theme-mdui/)
 
@@ -67,23 +67,15 @@ jekyll s -w
 ### _config
 
 ```yml
-title: "My blog" # Your site title
-description: "This is my blog." # Your site description
+title: "Jekyll-Theme-MDUI" # Your site title
+description: "A Jekyll theme based on MDUI" # Your site description
 url: # Your site url
 baseurl: # baseurl
-author: "My" # Your name
-avatar: "https://myAvatar.png" # Your avatar
-lang: "zh-CN" # lang
+author: "KeJun" # Your name
+
 paginate: 5 # paginate
 paginate_path: "/blog/page:num/" # paginate path
 
-disqus_shortname: "" # Your disqus 
-disqus_proxy: false # disqus proxy(Do not use)
-disqus_proxy_url: "" # (Do not use)
-disqus_api_key: "" # (Do not use)
-
-google_analytics: "" # Your google analytics ID
-
 gems: # paginate gem 
   - jekyll-paginate
 ```
@@ -111,57 +103,43 @@ Default does not display the editor.If you want the editor to appear in the menu
 ```
 * sns.yml
 ```yml
-- name: bilibili # name,supported:bilibili,facebook,github,gplus,instagram,linkedin,telegram,tumblr,twitter,weibo,zhihu
+- name: bilibili # name
   url:  # url , if it is empty, it is not enabled
 ```
+Supported:bilibili,facebook,github,gplus,instagram,linkedin,telegram,tumblr,twitter,weibo,zhihu
 
-
-### search.json
-
-```json
----
----
-[
-  {% for post in site.posts %}
-    {
-      "title"    : "{{ post.title | escape }}",
-      "url"      : "{{ site.baseurl }}{{ post.url }}"
-    } {% unless forloop.last %},{% endunless %}
-  {% endfor %}
-]
+* site.yml
+```yml
+head: 
+   favicon: "https://ooo.0o0.ooo/2017/05/27/59294212bc16e.png" # 网站的favicon
+   high_res_favicon: "https://ooo.0o0.ooo/2017/06/08/5939484dc618e.png" # 高清favicon
+   apple_touch_icon: "https://ooo.0o0.ooo/2017/06/08/5939484dc618e.png" # ios主屏按钮图标
+   keywords: "blog jekyll mdui theme" # 页面关键字
+uiux:
+   android_chrome_color: "#607D8B" # 安卓 Chrome 浏览器的地址栏颜色。
+   nprogress_color: "#29d" # 页面加载时顶部加载进度条的颜色。
+   nprogress_buffer: 200 # 页面加载时顶部加载进度条的缓冲时间。
+background: 
+   purecolor: "#eeeeee" # 背景颜色
+img: 
+   avatar: "https://ooo.0o0.ooo/2017/05/26/5928368d409dd.png" # 你的头像设置。
+card: # 首页卡片
+   card_shadow: 1 # 卡片阴影 0-24,0为不显示
+   card_hoverable: false # 悬浮时加深阴影
+disqus:
+   disqus_shortname: "kejun" # Your disqus 
+   disqus_proxy: false
+   disqus_proxy_url: "" # disqus proxy(Do not use)
+   disqus_api_key: "" # (Do not use)
+google_analytics: "" # (Do not use)
+lang: "zh-CN"  # lang
 ```
 
-### tags.json
-```json
----
----
-{% capture tags %}
-  {% for tag in site.tags %}
-    {{ tag[0] }}
-  {% endfor %}
-{% endcapture %}
-{% assign sortedtags = tags | split:' ' | sort %}
-[
-  {% for tag in sortedtags %}
-    {
-      "id"    : "{{ tag | escape}}",
-      "post": [
-          {% for post in site.tags[tag] %}
-         {
-            "title": "{{ post.title | escape }}",
-            "excerpt": "{{ post.excerpt | strip_html | escape | strip_newlines}}",
-            "url": "{{ site.baseurl }}{{ post.url }}"
-         } {% unless forloop.last %},{% endunless %}
-      {% endfor %}]
-    } {% unless forloop.last %},{% endunless %}
-  {% endfor %}
-]
-```
 ### manifest.json
 ```json
 {
   "name": "KeJun BLOG",
-  "short_name": "KeJun",
+  "short_name": "KeJun", 
   "icons": [{
         "src": "assets/images/touch/icon-128x128.png",
         "sizes": "128x128",

data/_includes/analytics.html

@@ -3,6 +3,6 @@
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
   m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
   })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', '{{ site.google_analytics }}', 'auto');
+  ga('create', '{{ site.data.site.google_analytics }}', 'auto');
   ga('send', 'pageview');
 </script>

data/_includes/disqus.html

@@ -1,10 +1,10 @@
-{% if site.disqus_shortname != "" %}
+{% if site.data.site.disqus.disqus_shortname != "" %}
 <div class="mdui-divider"></div>
-    {% if site.disqus_proxy == false %}
-    <button id="load-disqus" class="mdui-btn mdui-btn-block mdui-center" onclick="disqus.load();" data="{{ site.disqus_shortname }}">阅读评论 「请确保 Disqus 可以正常加载」</button>
+    {% if site.data.site.disqus.disqus_proxy == false %}
+    <button id="load-disqus" class="mdui-btn mdui-btn-block mdui-center" onclick="disqus.load();" data="{{ site.data.site.disqus.disqus_shortname }}">阅读评论 「请确保 Disqus 可以正常加载」</button>
     <div id="disqus_thread"></div>
     {% endif %}
-{% if site.disqus_proxy %}
+{% if site.data.site.disqus.disqus_proxy %}
 <div class="mdui-divider"></div>
 <div id="disqusreadonly" style="padding-top: 16px;">
 </div>

data/_includes/head.html

@@ -3,10 +3,15 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="author" content="{{site.author}}">
+    <meta name="theme-color" content="{{ site.data.site.uiux.android_chrome_color }}">
     {% if page.layout =="post" %}
     <meta name="keywords" content="{% for pagetag in page.tags %}{{pagetag}} {% endfor %}">
+    {% else %}
+    <meta name="keywords" content="{{ site.data.site.head.keywords }}">
     {% endif %}
-    <link href="{{ site.icon }}" rel="shortcut icon">
+    <link rel="shortcut icon" href="{{ site.data.site.head.favicon }}">
+    <link rel="icon" sizes="192x192" href="{{ site.data.site.head.high_res_favicon }}">
+    <link rel="apple-touch-icon" href="{{ site.data.site.head.apple_touch_icon }}">
     <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
     <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
     <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">

data/_includes/script.html

@@ -1,10 +1,135 @@
+<!--/* global-script-start */-->
 <script type="text/javascript" src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
 <script src="https://cdn.bootcss.com/mdui/0.2.1/js/mdui.min.js"></script>
 <script src="https://cdn.bootcss.com/nprogress/0.2.0/nprogress.min.js"></script>
 <script src="{{ "/assets/js/jquery.scrollToTop.js" | prepend: site.baseurl }}"></script>
+<script type="text/javascript">
+/* NProgress */
+NProgress.configure({
+    showSpinner: true
+});
+NProgress.start();
+$('#nprogress .bar').css({
+    'background': '{{site.data.site.uiux.nprogress_color}}'
+});
+$('#nprogress .peg').css({
+    'box-shadow': '0 0 10px {{site.data.site.uiux.nprogress_color}}, 0 0 15px {{site.data.site.uiux.nprogress_color}}'
+});
+$('#nprogress .spinner-icon').css({
+    'border-top-color': '{{site.data.site.uiux.nprogress_color}}',
+    'border-left-color': '{{site.data.site.uiux.nprogress_color}}'
+});
+setTimeout(function() {
+    NProgress.done();
+},{{site.data.site.uiux.nprogress_buffer}});
+/* serviceWorker */
+$(function(){
+    if ('serviceWorker' in navigator) {
+        navigator.serviceWorker.register("{{ "/sw.js" | relative_url }}").then(function() {
+            console.log("Service Worker Registered");
+        });
+    }
+    Array.prototype.forEach.call(document.querySelectorAll(".mdui-card-media"), function(a) {
+        var b = a.querySelector("a");
+        if (!b) {
+            return
+        }
+        var c = b.getAttribute("href");
+        if (!c) {
+            return
+        }
+        a.addEventListener("click", function() {
+            location.href = c
+        })
+    });
+    $("#toTop").scrollToTop();
+});
+</script>
+<!--/* global-script-end */-->
+<!--/* search-script-start */-->
 {% if page.layout =='search' %}
 <script src="{{ "/assets/js/jquery.typeahead.min.js" | prepend: site.baseurl }}"></script>
+<script>
+    var names = new Array();
+    var urls = new Array(); 
+    $.getJSON("{{ "/search.json" | relative_url }}").done(function(data){
+            for (var index in data){
+                var item = data[index];
+                names[index] = item.title;
+                urls[names[index]] = item.url
+            }
+            $.typeahead({
+                input: '.js-typeahead-country_v1',
+                order: "desc",
+                source: {
+                    data: names
+                },
+               selector: {
+                    container: "typeahead__container",
+                    result: " mdui-card k-search-card",
+                    list: "mdui-list",
+                    item: "mdui-list-item"
+                },
+                callback: {
+                    onClick: function (node,a,item,event){
+                        window.location.href = urls[item.display];
+                    },
+                }
+            });
+      });
+</script>
+{% endif %}
+<!--/* search-script-end */-->
+<!--/* post-script-start */-->
+{% if page.layout == "post" or page.layout == "page"%}
+
+<script>
+/* Disqus */
+var disqus = {
+    load : function disqus(){
+        var disqus_shortname = $("#load-disqus").attr("data");
+        if(typeof DISQUS !== 'object') {
+            (function () {
+                var s = document.createElement('script'); s.async = true;
+                s.type = 'text/javascript';
+                s.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+            }());
+            $('#load-disqus').remove(); 
+        }
+    }
+};
+</script>
+{% endif %}
+
+{% if page.layout == "post" %}
+<script src="https://cdn.bootcss.com/highlight.js/9.11.0/highlight.min.js"></script>
+<script src="{{ "/assets/js/toc.min.js" | prepend: site.baseurl }}"></script>
+<script src="{{ "/assets/js/pushpin.js" | prepend: site.baseurl }}"></script>
+<script>
+$(function(){
+    $('.mdui-card-content').find('a').attr('target','_blank');
+    $("div.k-page-col").css('margin',0);
+    hljs.initHighlightingOnLoad();
+    $('#toc').toc({
+        'selectors': 'h2',
+        'prefix': 'toc',
+        'highlightOffset': 64
+    });
+    $("#toc").find("ul").fadeIn(1000);
+    var tocBottom = $('.mdui-card-content').offset().top + $('.mdui-card-content').height() - $('#toc-card').height();
+    var tocOffset = $('.k-post-media').offset().top;
+    var tocTop = $('.mdui-card-header').offset().top;
+    $('#toc-card').pushpin({
+      top: tocTop,
+      bottom: 99999,
+      offset: tocOffset
+    });
+    })
+</script>
 {% endif %}
+<!--/* post-script-end */-->
+<!--/* editor-script-start */-->
 {% if page.layout =='editor' %}
 <script src="{{ "/assets/js/pickerdata.js" | prepend: site.baseurl }}"></script>
 <script src="{{ "/assets/js/chips.js" | prepend: site.baseurl }}"></script>
@@ -117,86 +242,10 @@ $(function(){
 });
 </script>
 {% endif %}
-<script type="text/javascript">
-    NProgress.configure({
-        showSpinner: true
-    });
-    NProgress.start();
-    setTimeout(function() {
-        NProgress.done();
-    },200);
-    var disqus = {
-    load : function disqus(){
-      var disqus_shortname = $("#load-disqus").attr("data");
-      if(typeof DISQUS !== 'object') {
-        (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-        }());
-        $('#load-disqus').remove(); 
-      }
-  }
-}
-</script>
-<script>
-$(function(){
-    if ('serviceWorker' in navigator) {
-        navigator.serviceWorker.register("{{ "/sw.js" | relative_url }}").then(function() {
-            console.log("Service Worker Registered");
-        });
-    }
-    Array.prototype.forEach.call(document.querySelectorAll(".mdui-card-media"), function(a) {
-        var b = a.querySelector("a");
-        if (!b) {
-            return
-        }
-        var c = b.getAttribute("href");
-        if (!c) {
-            return
-        }
-        a.addEventListener("click", function() {
-            location.href = c
-        })
-    });
-
-    $("#toTop").scrollToTop();
-    {% if page.layout =='search' %}
-    var names = new Array();
-    var urls = new Array(); 
-    $.getJSON("{{ "/search.json" | relative_url }}").done(function(data){
-            for (var index in data){
-                var item = data[index];
-                names[index] = item.title;
-                urls[names[index]] = item.url
-            }
-            $.typeahead({
-                input: '.js-typeahead-country_v1',
-                order: "desc",
-                source: {
-                    data: names
-                },
-               selector: {
-                    container: "typeahead__container",
-                    result: " mdui-card k-search-card",
-                    list: "mdui-list",
-                    item: "mdui-list-item"
-                },
-                callback: {
-                    onClick: function (node,a,item,event){
-                        window.location.href = urls[item.display];
-                    },
-                }
-            });
-      });
-      {% endif %}
-});
-</script>
-
+<!--/* editor-script-end */-->
+<!--/* tags-script-start */-->
 {% if page.layout == "tags" %}
 <script>
-
 $(function(){
     var tagid;
     $(".k-tagcloud").on("click",function(e){
@@ -223,35 +272,8 @@ $(function(){
         }
     })
 }
-    });
-
+});
 })
 </script>
 {% endif %}
-
-{% if page.layout == "post" %}
-<script src="https://cdn.bootcss.com/highlight.js/9.11.0/highlight.min.js"></script>
-<script src="{{ "/assets/js/toc.min.js" | prepend: site.baseurl }}"></script>
-<script src="{{ "/assets/js/pushpin.js" | prepend: site.baseurl }}"></script>
-<script>
-    $(function(){
-    $('.mdui-card-content').find('a').attr('target','_blank');
-    $("div.k-page-col").css('margin',0);
-    hljs.initHighlightingOnLoad();
-    $('#toc').toc({
-        'selectors': 'h2',
-        'prefix': 'toc',
-        'highlightOffset': 64
-    });
-    $("#toc").find("ul").fadeIn(1000);
-    var tocBottom = $('.mdui-card-content').offset().top + $('.mdui-card-content').height() - $('#toc-card').height();
-    var tocOffset = $('.k-post-media').offset().top;
-    var tocTop = $('.mdui-card-header').offset().top;
-    $('#toc-card').pushpin({
-      top: tocTop,
-      bottom: 99999,
-      offset: tocOffset
-    });
-    })
-</script>
-{% endif %}
+<!--/* tags-script-end */-->

data/_layouts/default.html

@@ -2,18 +2,15 @@
 layout: compress
 ---
 <!DOCTYPE html>
-<html lang="{{site.lang}}">
+<html lang="{{site.data.site.lang}}">
     {% include head.html %}
     <body class="mdui-appbar-with-toolbar mdui-theme-primary-white mdui-theme-accent-blue" style="opacity: 0;">
     {% include header.html %}
     {% include main.html %}
     {% include footer.html %}
     {% include script.html %}
-    {% if site.google_analytics != "" %}
+    {% if site.data.site.google_analytics != "" %}
     {% include analytics.html %}
     {% endif %}
-    {% if site.disqus_proxy %}
-    {% include test.html %}
-    {% endif %}
     </body>
 </html>

data/_layouts/home.html

@@ -4,7 +4,7 @@ layout: default
 <div class="k-container">
   <div class="k-posts-list">
     {% for post in paginator.posts %}
-    <div class="mdui-card k-list-card mdui-shadow-1">
+    <div class="mdui-card k-list-card mdui-shadow-{{site.data.site.card.card_shadow}} {% if site.data.site.card.card_hoverable == true%}mdui-hoverable{% endif %}">
       <div class="mdui-card-media k-post-media" style="background-image: url({{post.img}});">
         <div class="mdui-card-media-covered mdui-card-media-covered-gradient">
           <div class="mdui-card-primary">
@@ -17,7 +17,7 @@ layout: default
       </div>
       <div class="mdui-divider"></div>
       <div class="mdui-card-header">
-        <img class="mdui-card-header-avatar" src="{{site.avatar}}" />
+        <img class="mdui-card-header-avatar" src="{{site.data.site.img.avatar}}" />
         <div class="mdui-card-header-title">{{site.author}}</div>
         <div class="mdui-card-header-subtitle">{{ post.date | date: "%b %-d, %Y" }}</div>
       </div>

data/_layouts/page.html

@@ -14,7 +14,7 @@ layout: default
                     </div>
                 </div>
                 <div class="mdui-card-header">
-                    <img class="mdui-card-header-avatar" src="{{site.avatar}}" />
+                    <img class="mdui-card-header-avatar" src="{{site.data.site.img.avatar}}" />
                     <div class="mdui-card-header-title">{{site.author}}</div>
                     <div class="mdui-card-header-subtitle">{{ page.date | date: "%b %-d, %Y" }}</div>
                 </div>

data/_layouts/post.html

@@ -14,7 +14,7 @@ layout: default
                     </div>
                 </div>
                 <div class="mdui-card-header">
-                    <img class="mdui-card-header-avatar" src="{{site.avatar}}" />
+                    <img class="mdui-card-header-avatar" src="{{site.data.site.img.avatar}}" />
                     <div class="mdui-card-header-title">{{site.author}}</div>
                     <div class="mdui-card-header-subtitle">{{ page.date | date: "%b %-d, %Y" }}</div>
                 </div>

data/assets/css/main.css

@@ -109,7 +109,7 @@ text-decoration: none;
      margin-left: 0; 
 }
 body,header,#toc-card{
-    background-color:#eeeeee;
+    background-color:{{site.data.site.background.purecolor}};
 }
   body {
     display: flex;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-mdui
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - KeJun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-04 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: jekyll-feed
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement