jekyll-theme-mdui 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14ccbb04ad71ab034c9703cc76f3e9ee9011f6ea
-  data.tar.gz: f0eadc385802b8f7c12a03223eb10741562df3a5
+  metadata.gz: 3f94ec4000bc32d137aa8a1d1ff8a67fa64a7889
+  data.tar.gz: 4c29aadf4a10cf44d5ecc0a61ff9355ba6038401
 SHA512:
-  metadata.gz: 9b8a44c7e69d2db2909ec3cca3372e41019ffcd9311608f5ae7cec715310dec07afb90e3783b7efa6ecfba7a2464aec0e2f6e1b3797f865c2be854dfdbe98fd3
-  data.tar.gz: 12bf74d03234c673262ada6b8c1b37acf11179203dd526c98a737c879828bf4357b9cf06c0cb460e328d88c901da9035afd3918bd4e7823b283fb2f3c60bdb21
+  metadata.gz: '0874b2432b2c7e8fc1bebc96351c814c24e5dd26a8c2f90da9da2d41f2197213d4daade0f26f58b553950f77f923564d1e406432cc7bc74d8e9d457505219dcf'
+  data.tar.gz: a2313e1189a9033d075228661c72570a1004482b963a8b250d5662dafc08fc27a8b1c5db964bfd0f37a250de34e943f799157ece8afc9a0ac3001e88d2e1d242

data/README.md

@@ -18,7 +18,7 @@
 
 ## General
 
-[![Version](https://img.shields.io/badge/version-0.4.5-green.svg?style=flat-square)]()
+[![Version](https://img.shields.io/badge/version-0.4.7-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/)
 
@@ -40,13 +40,13 @@
 
 ## Docs
 
-[Docs](http://mdui.kejun.space/#/)
+[Docs](http://mdui.kejun.space/#/)(!!!Need Help!!!)
 
 [中文文档](http://mdui.kejun.space/#/zh-cn/)
 
 ## TODO
 
-- [ ] Editor - Online preview
+- [ ] Editor - Online preview (!!!Need Help!!!)
 - [ ] Category - Better style
 - [ ] Site style - More custom options
 
@@ -62,6 +62,7 @@ File Required or Optional:
 |tags.json|Optional|If you use the tags page, it is required.|
 |_data/friends.yml|Optional|If you use the friends page, it is required.|
 |_data/sns.yml|Optional|It is footer sns,if you want userd, it is required.|
+|_data/meng.yml|Optional|It is Meng option,if you want userd, it is required.|
 |_data/site.yml|Required|It is theme config.|
 |_data/lang.yml|Required|It is language config.|
 |_data/menus.yml|Required|It is site menus config.|

data/_includes/script.html

@@ -10,7 +10,7 @@
 {% if site.data.meng.console.switch == true %}
 {% if site.data.meng.console.theme_info == true %}
 <script>
-console.info("\n %c © Jekyll Theme MDUI |  Version: 0.4.5 | https://github.com/KeJunMao/jekyll-theme-mdui \n\n", "color: #fff; background: #448aff; padding:5px 0; border-radius: 5px 5px 5px 5px;");
+console.info("\n %c © Jekyll Theme MDUI |  Version: 0.4.7 | https://github.com/KeJunMao/jekyll-theme-mdui \n\n", "color: {{site.data.meng.console.color}}; background:{{site.data.meng.console.background}}; padding:5px 0; border-radius: 5px 5px 5px 5px;");
 </script>
 {% endif %}
 <script>
@@ -275,82 +275,38 @@ var disqus = {
 {% if site.data.site.uiux.meng == true %}
 {% if site.data.meng.header.switch == true%}
 <script>
-    const REG_HEX = /(^#?[0-9A-F]{6}$)|(^#?[0-9A-F]{3}$)/i;
-
-/*
- * rgb字符串解析
- * accepts: #333 #accded (without # is also fine)
- * not accept yet: rgb(), rgba()
- */
-var rgbToHex = function(rgb) {
-    var color = rgb.toString().match(/\d+/g);
-    var hex = "#";
-    for (var i = 0; i < 3; i++) {
-        hex += ("0" + Number(color[i]).toString(16)).slice(-2);
-    }
-    return hex;
-};
-function parseRGB(str){
-    if(typeof str === 'string' && REG_HEX.test(str) ){
-        str = str.replace('#', '');
-        let arr;
-        if(str.length === 3){
-            arr = str.split('').map(c => (c+c));
-        }
-        else if(str.length === 6){
-            arr = str.match(/[a-zA-Z0-9]{2}/g);
-        }
-        else{
-            throw new Error('wrong color format');
-        }
-        return arr.map((c) => parseInt(c, 16));
-    }
-    throw new Error('color should be string');
-}
-
-/*
- * rgb value to hsl 色相(H)、饱和度(S)、明度(L)
- */
-function rgbToHsl(rgbStr){
-    let [r, g, b] = parseRGB(rgbStr);
-    r /= 255, g /= 255, b /= 255;
-    let max = Math.max(r, g, b), min = Math.min(r, g, b);
-    let h, s, l = (max + min) / 2;
-
-    if(max == min){
-        h = s = 0; 
-    }else{
-        let d = max - min;
-        s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
-        switch(max){
-            case r: h = (g - b) / d + (g < b ? 6 : 0); break;
-            case g: h = (b - r) / d + 2; break;
-            case b: h = (r - g) / d + 4; break;
-        }
-        h /= 6;
-    }
-    return [h, s, l];
-}
-
-/*
- * 判断颜色属于深色还是浅色
- */
-function isColorDarkOrLight(rgbStr){
-    var color = rgbToHex(rgbStr);
-    let [h, s, l] = rgbToHsl(color);
-    return (l > 0.5)? 'light' : 'dark';
-}
 var appVersion = navigator.appVersion;
-
 if (appVersion.indexOf('Mobile') > 0){
     var isMobile = true;
 }
-if (isMobile){
-    var s = document.createElement('script'); s.async = true;
-    s.type = 'text/javascript';
-    s.src = '{{ "/assets/js/rgbaster.min.js" | prepend: site.baseurl }}';
-    (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-}
+    {% if page.themecolor == null %}
+    var pagethemecolorid = '{{page.id | remove:"/"}}ThemeColor';
+    var headertextcolor;
+    if (!localStorage[pagethemecolorid]){
+        if (isMobile){
+            var s = document.createElement('script'); s.async = true;
+            s.type = 'text/javascript';
+            s.src = '{{ "/assets/js/rgbaster.min.js" | prepend: site.baseurl }}';
+            (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+        }
+    }else{
+        if (isMobile){
+            headerthemecolor = localStorage[pagethemecolorid];
+            headertextcolor = localStorage[pagethemecolorid+'text'];
+            $('header').css('background-color',headerthemecolor);
+            $("meta[name='theme-color']").attr('content', headerthemecolor);
+            $('header').css('color',headertextcolor);
+        }
+    }
+    {% else %}
+    headerthemecolor = {{page.themecolor}};
+    headertextcolor = {{page.themetextcolor}};
+    if (isMobile){
+        $('header').css('background-color',headerthemecolor);
+        $("meta[name='theme-color']").attr('content', headerthemecolor);
+        $('header').css('color',headertextcolor);
+    }
+    {% endif %}
 </script>
 {% endif %}
 {% endif %}

data/_layouts/category.html

@@ -1,8 +1,16 @@
 ---
 layout: default
 ---
+<div class="k-posts-list"></div>
+{% if site.data.site.uiux.meng == true %}
+  {% if site.data.meng.background.switch == true %}
+    <div class="k-container mdui-card">
+  {% else %}
+    <div class="k-container">
+  {% endif %}
+{% else %}
 <div class="k-container">
-    <div class="k-posts-list"></div>
+{% endif %}
     {% for category in site.categories %}
     <ul class="mdui-list">
       <li class="mdui-subheader"><a name="{{ category | first }}">{{ category | first | upcase }}</a>

data/_layouts/tags.html

@@ -10,9 +10,16 @@ layout: default
 
 {% assign sortedtags = tags | split:' ' | sort %}
 
-
+<div class="k-posts-list"></div>
+{% if site.data.site.uiux.meng == true %}
+  {% if site.data.meng.background.switch == true %}
+    <div class="k-container mdui-card">
+  {% else %}
+    <div class="k-container">
+  {% endif %}
+{% else %}
 <div class="k-container">
-  <div class="k-posts-list"></div>
+{% endif %}
 {% for tag in sortedtags %}
   {% assign index = site.tags[tag] | size %}
   {% assign fontsize = 14 %}

data/assets/css/main.css

@@ -208,6 +208,47 @@ a{
     cursor:url({{site.data.meng.cursor.pointer_url}}), pointer;
 }
 {% endif %}
+{% if site.data.meng.background.switch == true %}
+body{
+    background-image: url({{site.data.meng.background.background_img}});
+    background-size: cover;
+    background-position: 50% 50%;
+    background-attachment: fixed;
+    background-repeat: no-repeat;
+}
+#toc-card{
+    background-color:transparent;
+}
+#toc a{
+    color: {{site.data.meng.background.text_color}};
+}
+{% if site.data.meng.background.transparent_header == true %}
+header{
+    background-color:rgba(0, 0, 0, 0);
+    color: {{site.data.meng.background.text_color}};
+}
+{% endif %}
+{% if site.data.meng.background.transparent_footer == true %}
+footer .mdui-card{
+    color: {{site.data.meng.background.text_color}};
+    background-color:rgba(0, 0, 0, 0);
+}
+{% endif %}
+{% endif %}
+{% if site.data.meng.card.switch ==true %}
+ .k-list-card{
+     background-color:{{site.data.meng.card.background_color}};
+ }
+ .k-container.mdui-card{
+     background-color:{{site.data.meng.card.background_color}};
+ }
+ .k-friend .mdui-card{
+     background-color:{{site.data.meng.card.background_color}};
+ }
+ .k-post-media{
+    opacity: {{site.data.meng.card.card_img_opacity}};
+ }
+{% endif %}
 {% endif %}
 
 {% for sns in site.data.sns %}

data/assets/js/rgbaster.min.js

@@ -1,11 +1,84 @@
 !function(n,t){"use strict";var e=function(n,t){var e=document.createElement("canvas");return e.setAttribute("width",n),e.setAttribute("height",t),e.getContext("2d")},r=function(n,t){var r=new Image,i=n.src||n;"data:"!==i.substring(0,5)&&(r.crossOrigin="Anonymous"),r.onload=function(){var n=e(r.width,r.height);n.drawImage(r,0,0);var i=n.getImageData(0,0,r.width,r.height);t&&t(i.data)},r.src=i},i=function(n){return["rgb(",n,")"].join("")},a=function(n){var t=[];for(var e in n)t.push(o(e,n[e]));return t.sort(function(n,t){return t.count-n.count}),t},u=function(n,t){if(n.length>t)return n.slice(0,t);for(var e=n.length-1;t-1>e;e++)n.push(o("0,0,0",0));return n},o=function(n,t){return{name:i(n),count:t}},c=10,s={};s.colors=function(n,e){e=e||{};var o=e.exclude||[],s=e.paletteSize||c;r(n,function(n){for(var r={},c="",f=[],d=0;d<n.length;d+=4)f[0]=n[d],f[1]=n[d+1],f[2]=n[d+2],c=f.join(","),-1===f.indexOf(t)&&0!==n[d+3]&&-1===o.indexOf(i(c))&&(r[c]=c in r?r[c]+1:1);if(e.success){var g=u(a(r),s+1);e.success({dominant:g[0].name,secondary:g[1].name,palette:g.map(function(n){return n.name}).slice(1)})}})},n.RGBaster=n.RGBaster||s}(window);
-    var img = $('.k-post-media').css('background-image').replace('url(','').replace(')','').replace(/\"/gi, "");
+    const REG_HEX = /(^#?[0-9A-F]{6}$)|(^#?[0-9A-F]{3}$)/i;
+
+/*
+ * rgb字符串解析
+ * {{page.id}}
+ * accepts: #333 #accded (without # is also fine)
+ * not accept yet: rgb(), rgba()
+ */
+var rgbToHex = function(rgb) {
+    var color = rgb.toString().match(/\d+/g);
+    var hex = "#";
+    for (var i = 0; i < 3; i++) {
+        hex += ("0" + Number(color[i]).toString(16)).slice(-2);
+    }
+    return hex;
+};
+function parseRGB(str){
+    if(typeof str === 'string' && REG_HEX.test(str) ){
+        str = str.replace('#', '');
+        let arr;
+        if(str.length === 3){
+            arr = str.split('').map(c => (c+c));
+        }
+        else if(str.length === 6){
+            arr = str.match(/[a-zA-Z0-9]{2}/g);
+        }
+        else{
+            throw new Error('wrong color format');
+        }
+        return arr.map((c) => parseInt(c, 16));
+    }
+    throw new Error('color should be string');
+}
+
+/*
+ * rgb value to hsl 色相(H)、饱和度(S)、明度(L)
+ */
+function rgbToHsl(rgbStr){
+    let [r, g, b] = parseRGB(rgbStr);
+    r /= 255, g /= 255, b /= 255;
+    let max = Math.max(r, g, b), min = Math.min(r, g, b);
+    let h, s, l = (max + min) / 2;
+
+    if(max == min){
+        h = s = 0; 
+    }else{
+        let d = max - min;
+        s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+        switch(max){
+            case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+            case g: h = (b - r) / d + 2; break;
+            case b: h = (r - g) / d + 4; break;
+        }
+        h /= 6;
+    }
+    return [h, s, l];
+}
+
+/*
+ * 判断颜色属于深色还是浅色
+ */
+function isColorDarkOrLight(rgbStr){
+    var color = rgbToHex(rgbStr);
+    let [h, s, l] = rgbToHsl(color);
+    return (l > 0.5)? 'light' : 'dark';
+}
+var headerColor;
+var img = $('.k-post-media').css('background-image').replace('url(','').replace(')','').replace(/\"/gi, "");
     var colors = RGBaster.colors(img, {
       paletteSize: 30,
       success: function(colors){
+        headerColor = colors.dominant;
+        localStorage[pagethemecolorid] = headerColor;
         if(isColorDarkOrLight(colors.dominant) === "dark"){
+            headertextcolor = '#fff';
+            localStorage[pagethemecolorid+'text'] = headertextcolor;
             $('header').css('color','#fff');
         }else{
+            headertextcolor = '#000';
+            localStorage[pagethemecolorid+'text'] = headertextcolor;
             $('header').css('color','#000');
         }
         $('header').css('background-color',colors.dominant);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-mdui
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - KeJun