diff --git a/README.md b/README.md index 4dda7d7..df77426 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Zzo theme for Hugo -**Zzo** theme made for bloggers. +**Zzo** is a blog theme for Hugo with many features. It uses HTML5 with a modern CSS grid and flex layout. Recent versions of all the mayor browsers support it, see [Can I use css grid](http://caniuse.com/#search=grid). @@ -221,21 +221,28 @@ You shoud make your own menu. description = "The Zzo theme for Hugo example site." custom_css = ["css/custom.css", "css/custom.css"] custom_js = ["js/custom.js"] -custom_skin = "custom" +myname = "yourname" +whoami = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In sit amet cursus massa. Vestibulum eu posuere est. Suspendisse erat purus, mollis in leo quis, hendrerit fringilla felis." # body enableToc = true enableBreadcrumb = true -enableCustomScrollbar = true enablePhotoSwipe = true enableSearch = true enableMark = true +enableGoToTop = true +enableWhoami = true # sidebar enableSidebarTags = true enableSidebarSeries = true enableSidebarCategories = true +# comment +enableComment = false +disqus_shortname = "" +commento = false + # footer showPoweredBy = true showFeedLinks = true @@ -244,6 +251,7 @@ enableLangChange = true enableThemeChange = true themeOptions = ["dark", "light", "hacker", "solarized"] [socialOptions] + email = "mailto:your@email.com" facebook = "http://example.org/" twitter = "http://example.org/" github = "http://example.org/" @@ -254,7 +262,7 @@ themeOptions = ["dark", "light", "hacker", "solarized"] medium = "" tumblr = "" linkedin = "" - pinterest = "http://example.org/" + pinterest = "" stack-exchange = "" ``` diff --git a/archetypes/about.md b/archetypes/about.md index f315ec8..d710c9b 100644 --- a/archetypes/about.md +++ b/archetypes/about.md @@ -1,7 +1,7 @@ --- title: "{{ replace .Name "-" " " | title }}" date: {{ .Date }} -desc: +description: type: about tags: - diff --git a/archetypes/archive.md b/archetypes/archive.md index 939dc37..a238a55 100644 --- a/archetypes/archive.md +++ b/archetypes/archive.md @@ -1,7 +1,7 @@ --- title: "{{ replace .Name "-" " " | title }}" date: {{ .Date }} -desc: +description: type: archive tags: - diff --git a/archetypes/default.md b/archetypes/default.md index 0f69e6a..5f7e4bd 100644 --- a/archetypes/default.md +++ b/archetypes/default.md @@ -1,7 +1,7 @@ --- title: "{{ replace .Name "-" " " | title }}" date: {{ .Date }} -desc: +description: tags: - series: diff --git a/archetypes/gallery.md b/archetypes/gallery.md index b7d0e9f..aaf539b 100644 --- a/archetypes/gallery.md +++ b/archetypes/gallery.md @@ -1,7 +1,7 @@ --- title: "{{ replace .Name "-" " " | title }}" date: {{ .Date }} -desc: +description: type: gallery tags: - diff --git a/assets/css/photoswipe/custom-skin.css b/assets/css/photoswipe/custom-skin.css index 91ca289..6a88eae 100644 --- a/assets/css/photoswipe/custom-skin.css +++ b/assets/css/photoswipe/custom-skin.css @@ -56,7 +56,7 @@ .pswp__button, .pswp__button--arrow--left:before, .pswp__button--arrow--right:before { - background: url(images/photoswipe/default-skin.png) 0 0 no-repeat; + background: url(../../images/photoswipe/default-skin.png) 0 0 no-repeat; background-size: 264px 88px; width: 44px; height: 44px; @@ -71,7 +71,7 @@ .pswp--svg .pswp__button, .pswp--svg .pswp__button--arrow--left:before, .pswp--svg .pswp__button--arrow--right:before { - background-image: url(images/photoswipe/default-skin.svg); + background-image: url(../../images/photoswipe/default-skin.svg); } .pswp--svg .pswp__button--arrow--left, @@ -372,7 +372,7 @@ a.pswp__share--download:hover { .pswp__preloader--active .pswp__preloader__icn { /* We use .gif in browsers that don't support CSS animation */ - background: url(/images/photoswipe/preloader.gif) 0 0 no-repeat; + background: url(../../images/photoswipe/preloader.gif) 0 0 no-repeat; } .pswp--css_animation .pswp__preloader--active { diff --git a/assets/js/perfect-scrollbar.jquery.min.js b/assets/js/perfect-scrollbar.jquery.min.js deleted file mode 100644 index 8473b2f..0000000 --- a/assets/js/perfect-scrollbar.jquery.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/* perfect-scrollbar v0.6.14 */ -!function t(e,n,r){function o(i,s){if(!n[i]){if(!e[i]){var a="function"==typeof require&&require;if(!s&&a)return a(i,!0);if(l)return l(i,!0);var c=new Error("Cannot find module '"+i+"'");throw c.code="MODULE_NOT_FOUND",c}var u=n[i]={exports:{}};e[i][0].call(u.exports,function(t){var n=e[i][1][t];return o(n?n:t)},u,u.exports,t,e,n,r)}return n[i].exports}for(var l="function"==typeof require&&require,i=0;i=0&&n.splice(r,1),t.className=n.join(" ")}n.add=function(t,e){t.classList?t.classList.add(e):r(t,e)},n.remove=function(t,e){t.classList?t.classList.remove(e):o(t,e)},n.list=function(t){return t.classList?Array.prototype.slice.apply(t.classList):t.className.split(" ")}},{}],3:[function(t,e,n){"use strict";function r(t,e){return window.getComputedStyle(t)[e]}function o(t,e,n){return"number"==typeof n&&(n=n.toString()+"px"),t.style[e]=n,t}function l(t,e){for(var n in e){var r=e[n];"number"==typeof r&&(r=r.toString()+"px"),t.style[n]=r}return t}var i={};i.e=function(t,e){var n=document.createElement(t);return n.className=e,n},i.appendTo=function(t,e){return e.appendChild(t),t},i.css=function(t,e,n){return"object"==typeof e?l(t,e):"undefined"==typeof n?r(t,e):o(t,e,n)},i.matches=function(t,e){return"undefined"!=typeof t.matches?t.matches(e):"undefined"!=typeof t.matchesSelector?t.matchesSelector(e):"undefined"!=typeof t.webkitMatchesSelector?t.webkitMatchesSelector(e):"undefined"!=typeof t.mozMatchesSelector?t.mozMatchesSelector(e):"undefined"!=typeof t.msMatchesSelector?t.msMatchesSelector(e):void 0},i.remove=function(t){"undefined"!=typeof t.remove?t.remove():t.parentNode&&t.parentNode.removeChild(t)},i.queryChildren=function(t,e){return Array.prototype.filter.call(t.childNodes,function(t){return i.matches(t,e)})},e.exports=i},{}],4:[function(t,e,n){"use strict";var r=function(t){this.element=t,this.events={}};r.prototype.bind=function(t,e){"undefined"==typeof this.events[t]&&(this.events[t]=[]),this.events[t].push(e),this.element.addEventListener(t,e,!1)},r.prototype.unbind=function(t,e){var n="undefined"!=typeof e;this.events[t]=this.events[t].filter(function(r){return!(!n||r===e)||(this.element.removeEventListener(t,r,!1),!1)},this)},r.prototype.unbindAll=function(){for(var t in this.events)this.unbind(t)};var o=function(){this.eventElements=[]};o.prototype.eventElement=function(t){var e=this.eventElements.filter(function(e){return e.element===t})[0];return"undefined"==typeof e&&(e=new r(t),this.eventElements.push(e)),e},o.prototype.bind=function(t,e,n){this.eventElement(t).bind(e,n)},o.prototype.unbind=function(t,e,n){this.eventElement(t).unbind(e,n)},o.prototype.unbindAll=function(){for(var t=0;te.scrollbarYTop?1:-1;i(t,"top",t.scrollTop+s*e.containerHeight),l(t),r.stopPropagation()}),e.event.bind(e.scrollbarX,"click",r),e.event.bind(e.scrollbarXRail,"click",function(r){var o=r.pageX-window.pageXOffset-n(e.scrollbarXRail).left,s=o>e.scrollbarXLeft?1:-1;i(t,"left",t.scrollLeft+s*e.containerWidth),l(t),r.stopPropagation()})}var o=t("../instances"),l=t("../update-geometry"),i=t("../update-scroll");e.exports=function(t){var e=o.get(t);r(t,e)}},{"../instances":18,"../update-geometry":19,"../update-scroll":20}],11:[function(t,e,n){"use strict";function r(t,e){function n(n){var o=r+n*e.railXRatio,i=Math.max(0,e.scrollbarXRail.getBoundingClientRect().left)+e.railXRatio*(e.railXWidth-e.scrollbarXWidth);o<0?e.scrollbarXLeft=0:o>i?e.scrollbarXLeft=i:e.scrollbarXLeft=o;var s=l.toInt(e.scrollbarXLeft*(e.contentWidth-e.containerWidth)/(e.containerWidth-e.railXRatio*e.scrollbarXWidth))-e.negativeScrollAdjustment;c(t,"left",s)}var r=null,o=null,s=function(e){n(e.pageX-o),a(t),e.stopPropagation(),e.preventDefault()},u=function(){l.stopScrolling(t,"x"),e.event.unbind(e.ownerDocument,"mousemove",s)};e.event.bind(e.scrollbarX,"mousedown",function(n){o=n.pageX,r=l.toInt(i.css(e.scrollbarX,"left"))*e.railXRatio,l.startScrolling(t,"x"),e.event.bind(e.ownerDocument,"mousemove",s),e.event.once(e.ownerDocument,"mouseup",u),n.stopPropagation(),n.preventDefault()})}function o(t,e){function n(n){var o=r+n*e.railYRatio,i=Math.max(0,e.scrollbarYRail.getBoundingClientRect().top)+e.railYRatio*(e.railYHeight-e.scrollbarYHeight);o<0?e.scrollbarYTop=0:o>i?e.scrollbarYTop=i:e.scrollbarYTop=o;var s=l.toInt(e.scrollbarYTop*(e.contentHeight-e.containerHeight)/(e.containerHeight-e.railYRatio*e.scrollbarYHeight));c(t,"top",s)}var r=null,o=null,s=function(e){n(e.pageY-o),a(t),e.stopPropagation(),e.preventDefault()},u=function(){l.stopScrolling(t,"y"),e.event.unbind(e.ownerDocument,"mousemove",s)};e.event.bind(e.scrollbarY,"mousedown",function(n){o=n.pageY,r=l.toInt(i.css(e.scrollbarY,"top"))*e.railYRatio,l.startScrolling(t,"y"),e.event.bind(e.ownerDocument,"mousemove",s),e.event.once(e.ownerDocument,"mouseup",u),n.stopPropagation(),n.preventDefault()})}var l=t("../../lib/helper"),i=t("../../lib/dom"),s=t("../instances"),a=t("../update-geometry"),c=t("../update-scroll");e.exports=function(t){var e=s.get(t);r(t,e),o(t,e)}},{"../../lib/dom":3,"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],12:[function(t,e,n){"use strict";function r(t,e){function n(n,r){var o=t.scrollTop;if(0===n){if(!e.scrollbarYActive)return!1;if(0===o&&r>0||o>=e.contentHeight-e.containerHeight&&r<0)return!e.settings.wheelPropagation}var l=t.scrollLeft;if(0===r){if(!e.scrollbarXActive)return!1;if(0===l&&n<0||l>=e.contentWidth-e.containerWidth&&n>0)return!e.settings.wheelPropagation}return!0}var r=!1;e.event.bind(t,"mouseenter",function(){r=!0}),e.event.bind(t,"mouseleave",function(){r=!1});var i=!1;e.event.bind(e.ownerDocument,"keydown",function(c){if(!(c.isDefaultPrevented&&c.isDefaultPrevented()||c.defaultPrevented)){var u=l.matches(e.scrollbarX,":focus")||l.matches(e.scrollbarY,":focus");if(r||u){var d=document.activeElement?document.activeElement:e.ownerDocument.activeElement;if(d){if("IFRAME"===d.tagName)d=d.contentDocument.activeElement;else for(;d.shadowRoot;)d=d.shadowRoot.activeElement;if(o.isEditable(d))return}var p=0,f=0;switch(c.which){case 37:p=c.metaKey?-e.contentWidth:c.altKey?-e.containerWidth:-30;break;case 38:f=c.metaKey?e.contentHeight:c.altKey?e.containerHeight:30;break;case 39:p=c.metaKey?e.contentWidth:c.altKey?e.containerWidth:30;break;case 40:f=c.metaKey?-e.contentHeight:c.altKey?-e.containerHeight:-30;break;case 33:f=90;break;case 32:f=c.shiftKey?90:-90;break;case 34:f=-90;break;case 35:f=c.ctrlKey?-e.contentHeight:-e.containerHeight;break;case 36:f=c.ctrlKey?t.scrollTop:e.containerHeight;break;default:return}a(t,"top",t.scrollTop-f),a(t,"left",t.scrollLeft+p),s(t),i=n(p,f),i&&c.preventDefault()}}})}var o=t("../../lib/helper"),l=t("../../lib/dom"),i=t("../instances"),s=t("../update-geometry"),a=t("../update-scroll");e.exports=function(t){var e=i.get(t);r(t,e)}},{"../../lib/dom":3,"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],13:[function(t,e,n){"use strict";function r(t,e){function n(n,r){var o=t.scrollTop;if(0===n){if(!e.scrollbarYActive)return!1;if(0===o&&r>0||o>=e.contentHeight-e.containerHeight&&r<0)return!e.settings.wheelPropagation}var l=t.scrollLeft;if(0===r){if(!e.scrollbarXActive)return!1;if(0===l&&n<0||l>=e.contentWidth-e.containerWidth&&n>0)return!e.settings.wheelPropagation}return!0}function r(t){var e=t.deltaX,n=-1*t.deltaY;return"undefined"!=typeof e&&"undefined"!=typeof n||(e=-1*t.wheelDeltaX/6,n=t.wheelDeltaY/6),t.deltaMode&&1===t.deltaMode&&(e*=10,n*=10),e!==e&&n!==n&&(e=0,n=t.wheelDelta),t.shiftKey?[-n,-e]:[e,n]}function o(e,n){var r=t.querySelector("textarea:hover, select[multiple]:hover, .ps-child:hover");if(r){if(!window.getComputedStyle(r).overflow.match(/(scroll|auto)/))return!1;var o=r.scrollHeight-r.clientHeight;if(o>0&&!(0===r.scrollTop&&n>0||r.scrollTop===o&&n<0))return!0;var l=r.scrollLeft-r.clientWidth;if(l>0&&!(0===r.scrollLeft&&e<0||r.scrollLeft===l&&e>0))return!0}return!1}function s(s){var c=r(s),u=c[0],d=c[1];o(u,d)||(a=!1,e.settings.useBothWheelAxes?e.scrollbarYActive&&!e.scrollbarXActive?(d?i(t,"top",t.scrollTop-d*e.settings.wheelSpeed):i(t,"top",t.scrollTop+u*e.settings.wheelSpeed),a=!0):e.scrollbarXActive&&!e.scrollbarYActive&&(u?i(t,"left",t.scrollLeft+u*e.settings.wheelSpeed):i(t,"left",t.scrollLeft-d*e.settings.wheelSpeed),a=!0):(i(t,"top",t.scrollTop-d*e.settings.wheelSpeed),i(t,"left",t.scrollLeft+u*e.settings.wheelSpeed)),l(t),a=a||n(u,d),a&&(s.stopPropagation(),s.preventDefault()))}var a=!1;"undefined"!=typeof window.onwheel?e.event.bind(t,"wheel",s):"undefined"!=typeof window.onmousewheel&&e.event.bind(t,"mousewheel",s)}var o=t("../instances"),l=t("../update-geometry"),i=t("../update-scroll");e.exports=function(t){var e=o.get(t);r(t,e)}},{"../instances":18,"../update-geometry":19,"../update-scroll":20}],14:[function(t,e,n){"use strict";function r(t,e){e.event.bind(t,"scroll",function(){l(t)})}var o=t("../instances"),l=t("../update-geometry");e.exports=function(t){var e=o.get(t);r(t,e)}},{"../instances":18,"../update-geometry":19}],15:[function(t,e,n){"use strict";function r(t,e){function n(){var t=window.getSelection?window.getSelection():document.getSelection?document.getSelection():"";return 0===t.toString().length?null:t.getRangeAt(0).commonAncestorContainer}function r(){c||(c=setInterval(function(){return l.get(t)?(s(t,"top",t.scrollTop+u.top),s(t,"left",t.scrollLeft+u.left),void i(t)):void clearInterval(c)},50))}function a(){c&&(clearInterval(c),c=null),o.stopScrolling(t)}var c=null,u={top:0,left:0},d=!1;e.event.bind(e.ownerDocument,"selectionchange",function(){t.contains(n())?d=!0:(d=!1,a())}),e.event.bind(window,"mouseup",function(){d&&(d=!1,a())}),e.event.bind(window,"keyup",function(){d&&(d=!1,a())}),e.event.bind(window,"mousemove",function(e){if(d){var n={x:e.pageX,y:e.pageY},l={left:t.offsetLeft,right:t.offsetLeft+t.offsetWidth,top:t.offsetTop,bottom:t.offsetTop+t.offsetHeight};n.xl.right-3?(u.left=5,o.startScrolling(t,"x")):u.left=0,n.yl.bottom-3?(n.y-l.bottom+3<5?u.top=5:u.top=20,o.startScrolling(t,"y")):u.top=0,0===u.top&&0===u.left?a():r()}})}var o=t("../../lib/helper"),l=t("../instances"),i=t("../update-geometry"),s=t("../update-scroll");e.exports=function(t){var e=l.get(t);r(t,e)}},{"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],16:[function(t,e,n){"use strict";function r(t,e,n,r){function o(n,r){var o=t.scrollTop,l=t.scrollLeft,i=Math.abs(n),s=Math.abs(r);if(s>i){if(r<0&&o===e.contentHeight-e.containerHeight||r>0&&0===o)return!e.settings.swipePropagation}else if(i>s&&(n<0&&l===e.contentWidth-e.containerWidth||n>0&&0===l))return!e.settings.swipePropagation;return!0}function a(e,n){s(t,"top",t.scrollTop-n),s(t,"left",t.scrollLeft-e),i(t)}function c(){w=!0}function u(){w=!1}function d(t){return t.targetTouches?t.targetTouches[0]:t}function p(t){return!(!t.targetTouches||1!==t.targetTouches.length)||!(!t.pointerType||"mouse"===t.pointerType||t.pointerType===t.MSPOINTER_TYPE_MOUSE)}function f(t){if(p(t)){Y=!0;var e=d(t);g.pageX=e.pageX,g.pageY=e.pageY,v=(new Date).getTime(),null!==y&&clearInterval(y),t.stopPropagation()}}function h(t){if(!Y&&e.settings.swipePropagation&&f(t),!w&&Y&&p(t)){var n=d(t),r={pageX:n.pageX,pageY:n.pageY},l=r.pageX-g.pageX,i=r.pageY-g.pageY;a(l,i),g=r;var s=(new Date).getTime(),c=s-v;c>0&&(m.x=l/c,m.y=i/c,v=s),o(l,i)&&(t.stopPropagation(),t.preventDefault())}}function b(){!w&&Y&&(Y=!1,clearInterval(y),y=setInterval(function(){return l.get(t)&&(m.x||m.y)?Math.abs(m.x)<.01&&Math.abs(m.y)<.01?void clearInterval(y):(a(30*m.x,30*m.y),m.x*=.8,void(m.y*=.8)):void clearInterval(y)},10))}var g={},v=0,m={},y=null,w=!1,Y=!1;n&&(e.event.bind(window,"touchstart",c),e.event.bind(window,"touchend",u),e.event.bind(t,"touchstart",f),e.event.bind(t,"touchmove",h),e.event.bind(t,"touchend",b)),r&&(window.PointerEvent?(e.event.bind(window,"pointerdown",c),e.event.bind(window,"pointerup",u),e.event.bind(t,"pointerdown",f),e.event.bind(t,"pointermove",h),e.event.bind(t,"pointerup",b)):window.MSPointerEvent&&(e.event.bind(window,"MSPointerDown",c),e.event.bind(window,"MSPointerUp",u),e.event.bind(t,"MSPointerDown",f),e.event.bind(t,"MSPointerMove",h),e.event.bind(t,"MSPointerUp",b)))}var o=t("../../lib/helper"),l=t("../instances"),i=t("../update-geometry"),s=t("../update-scroll");e.exports=function(t){if(o.env.supportsTouch||o.env.supportsIePointer){var e=l.get(t);r(t,e,o.env.supportsTouch,o.env.supportsIePointer)}}},{"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],17:[function(t,e,n){"use strict";var r=t("../lib/helper"),o=t("../lib/class"),l=t("./instances"),i=t("./update-geometry"),s={"click-rail":t("./handler/click-rail"),"drag-scrollbar":t("./handler/drag-scrollbar"),keyboard:t("./handler/keyboard"),wheel:t("./handler/mouse-wheel"),touch:t("./handler/touch"),selection:t("./handler/selection")},a=t("./handler/native-scroll");e.exports=function(t,e){e="object"==typeof e?e:{},o.add(t,"ps-container");var n=l.add(t);n.settings=r.extend(n.settings,e),o.add(t,"ps-theme-"+n.settings.theme),n.settings.handlers.forEach(function(e){s[e](t)}),a(t),i(t)}},{"../lib/class":2,"../lib/helper":6,"./handler/click-rail":10,"./handler/drag-scrollbar":11,"./handler/keyboard":12,"./handler/mouse-wheel":13,"./handler/native-scroll":14,"./handler/selection":15,"./handler/touch":16,"./instances":18,"./update-geometry":19}],18:[function(t,e,n){"use strict";function r(t){function e(){a.add(t,"ps-focus")}function n(){a.remove(t,"ps-focus")}var r=this;r.settings=s.clone(c),r.containerWidth=null,r.containerHeight=null,r.contentWidth=null,r.contentHeight=null,r.isRtl="rtl"===u.css(t,"direction"),r.isNegativeScroll=function(){var e=t.scrollLeft,n=null;return t.scrollLeft=-1,n=t.scrollLeft<0,t.scrollLeft=e,n}(),r.negativeScrollAdjustment=r.isNegativeScroll?t.scrollWidth-t.clientWidth:0,r.event=new d,r.ownerDocument=t.ownerDocument||document,r.scrollbarXRail=u.appendTo(u.e("div","ps-scrollbar-x-rail"),t),r.scrollbarX=u.appendTo(u.e("div","ps-scrollbar-x"),r.scrollbarXRail),r.scrollbarX.setAttribute("tabindex",0),r.event.bind(r.scrollbarX,"focus",e),r.event.bind(r.scrollbarX,"blur",n),r.scrollbarXActive=null,r.scrollbarXWidth=null,r.scrollbarXLeft=null,r.scrollbarXBottom=s.toInt(u.css(r.scrollbarXRail,"bottom")),r.isScrollbarXUsingBottom=r.scrollbarXBottom===r.scrollbarXBottom,r.scrollbarXTop=r.isScrollbarXUsingBottom?null:s.toInt(u.css(r.scrollbarXRail,"top")),r.railBorderXWidth=s.toInt(u.css(r.scrollbarXRail,"borderLeftWidth"))+s.toInt(u.css(r.scrollbarXRail,"borderRightWidth")),u.css(r.scrollbarXRail,"display","block"),r.railXMarginWidth=s.toInt(u.css(r.scrollbarXRail,"marginLeft"))+s.toInt(u.css(r.scrollbarXRail,"marginRight")),u.css(r.scrollbarXRail,"display",""),r.railXWidth=null,r.railXRatio=null,r.scrollbarYRail=u.appendTo(u.e("div","ps-scrollbar-y-rail"),t),r.scrollbarY=u.appendTo(u.e("div","ps-scrollbar-y"),r.scrollbarYRail),r.scrollbarY.setAttribute("tabindex",0),r.event.bind(r.scrollbarY,"focus",e),r.event.bind(r.scrollbarY,"blur",n),r.scrollbarYActive=null,r.scrollbarYHeight=null,r.scrollbarYTop=null,r.scrollbarYRight=s.toInt(u.css(r.scrollbarYRail,"right")),r.isScrollbarYUsingRight=r.scrollbarYRight===r.scrollbarYRight,r.scrollbarYLeft=r.isScrollbarYUsingRight?null:s.toInt(u.css(r.scrollbarYRail,"left")),r.scrollbarYOuterWidth=r.isRtl?s.outerWidth(r.scrollbarY):null,r.railBorderYWidth=s.toInt(u.css(r.scrollbarYRail,"borderTopWidth"))+s.toInt(u.css(r.scrollbarYRail,"borderBottomWidth")),u.css(r.scrollbarYRail,"display","block"),r.railYMarginHeight=s.toInt(u.css(r.scrollbarYRail,"marginTop"))+s.toInt(u.css(r.scrollbarYRail,"marginBottom")),u.css(r.scrollbarYRail,"display",""),r.railYHeight=null,r.railYRatio=null}function o(t){return t.getAttribute("data-ps-id")}function l(t,e){t.setAttribute("data-ps-id",e)}function i(t){t.removeAttribute("data-ps-id")}var s=t("../lib/helper"),a=t("../lib/class"),c=t("./default-setting"),u=t("../lib/dom"),d=t("../lib/event-manager"),p=t("../lib/guid"),f={};n.add=function(t){var e=p();return l(t,e),f[e]=new r(t),f[e]},n.remove=function(t){delete f[o(t)],i(t)},n.get=function(t){return f[o(t)]}},{"../lib/class":2,"../lib/dom":3,"../lib/event-manager":4,"../lib/guid":5,"../lib/helper":6,"./default-setting":8}],19:[function(t,e,n){"use strict";function r(t,e){return t.settings.minScrollbarLength&&(e=Math.max(e,t.settings.minScrollbarLength)),t.settings.maxScrollbarLength&&(e=Math.min(e,t.settings.maxScrollbarLength)),e}function o(t,e){var n={width:e.railXWidth};e.isRtl?n.left=e.negativeScrollAdjustment+t.scrollLeft+e.containerWidth-e.contentWidth:n.left=t.scrollLeft,e.isScrollbarXUsingBottom?n.bottom=e.scrollbarXBottom-t.scrollTop:n.top=e.scrollbarXTop+t.scrollTop,s.css(e.scrollbarXRail,n);var r={top:t.scrollTop,height:e.railYHeight};e.isScrollbarYUsingRight?e.isRtl?r.right=e.contentWidth-(e.negativeScrollAdjustment+t.scrollLeft)-e.scrollbarYRight-e.scrollbarYOuterWidth:r.right=e.scrollbarYRight-t.scrollLeft:e.isRtl?r.left=e.negativeScrollAdjustment+t.scrollLeft+2*e.containerWidth-e.contentWidth-e.scrollbarYLeft-e.scrollbarYOuterWidth:r.left=e.scrollbarYLeft+t.scrollLeft,s.css(e.scrollbarYRail,r),s.css(e.scrollbarX,{left:e.scrollbarXLeft,width:e.scrollbarXWidth-e.railBorderXWidth}),s.css(e.scrollbarY,{top:e.scrollbarYTop,height:e.scrollbarYHeight-e.railBorderYWidth})}var l=t("../lib/helper"),i=t("../lib/class"),s=t("../lib/dom"),a=t("./instances"),c=t("./update-scroll");e.exports=function(t){var e=a.get(t);e.containerWidth=t.clientWidth,e.containerHeight=t.clientHeight,e.contentWidth=t.scrollWidth,e.contentHeight=t.scrollHeight;var n;t.contains(e.scrollbarXRail)||(n=s.queryChildren(t,".ps-scrollbar-x-rail"),n.length>0&&n.forEach(function(t){s.remove(t)}),s.appendTo(e.scrollbarXRail,t)),t.contains(e.scrollbarYRail)||(n=s.queryChildren(t,".ps-scrollbar-y-rail"),n.length>0&&n.forEach(function(t){s.remove(t)}),s.appendTo(e.scrollbarYRail,t)),!e.settings.suppressScrollX&&e.containerWidth+e.settings.scrollXMarginOffset=e.railXWidth-e.scrollbarXWidth&&(e.scrollbarXLeft=e.railXWidth-e.scrollbarXWidth),e.scrollbarYTop>=e.railYHeight-e.scrollbarYHeight&&(e.scrollbarYTop=e.railYHeight-e.scrollbarYHeight),o(t,e),e.scrollbarXActive?i.add(t,"ps-active-x"):(i.remove(t,"ps-active-x"),e.scrollbarXWidth=0,e.scrollbarXLeft=0,c(t,"left",0)),e.scrollbarYActive?i.add(t,"ps-active-y"):(i.remove(t,"ps-active-y"),e.scrollbarYHeight=0,e.scrollbarYTop=0,c(t,"top",0))}},{"../lib/class":2,"../lib/dom":3,"../lib/helper":6,"./instances":18,"./update-scroll":20}],20:[function(t,e,n){"use strict";var r,o,l=t("./instances"),i=function(t){var e=document.createEvent("Event");return e.initEvent(t,!0,!0),e};e.exports=function(t,e,n){if("undefined"==typeof t)throw"You must provide an element to the update-scroll function";if("undefined"==typeof e)throw"You must provide an axis to the update-scroll function";if("undefined"==typeof n)throw"You must provide a value to the update-scroll function";"top"===e&&n<=0&&(t.scrollTop=n=0,t.dispatchEvent(i("ps-y-reach-start"))),"left"===e&&n<=0&&(t.scrollLeft=n=0,t.dispatchEvent(i("ps-x-reach-start")));var s=l.get(t);"top"===e&&n>=s.contentHeight-s.containerHeight&&(n=s.contentHeight-s.containerHeight,n-t.scrollTop<=1?n=t.scrollTop:t.scrollTop=n,t.dispatchEvent(i("ps-y-reach-end"))),"left"===e&&n>=s.contentWidth-s.containerWidth&&(n=s.contentWidth-s.containerWidth,n-t.scrollLeft<=1?n=t.scrollLeft:t.scrollLeft=n,t.dispatchEvent(i("ps-x-reach-end"))),r||(r=t.scrollTop),o||(o=t.scrollLeft),"top"===e&&nr&&t.dispatchEvent(i("ps-scroll-down")),"left"===e&&no&&t.dispatchEvent(i("ps-scroll-right")),"top"===e&&(t.scrollTop=r=n,t.dispatchEvent(i("ps-scroll-y"))),"left"===e&&(t.scrollLeft=o=n,t.dispatchEvent(i("ps-scroll-x")))}},{"./instances":18}],21:[function(t,e,n){"use strict";var r=t("../lib/helper"),o=t("../lib/dom"),l=t("./instances"),i=t("./update-geometry"),s=t("./update-scroll");e.exports=function(t){var e=l.get(t);e&&(e.negativeScrollAdjustment=e.isNegativeScroll?t.scrollWidth-t.clientWidth:0,o.css(e.scrollbarXRail,"display","block"),o.css(e.scrollbarYRail,"display","block"),e.railXMarginWidth=r.toInt(o.css(e.scrollbarXRail,"marginLeft"))+r.toInt(o.css(e.scrollbarXRail,"marginRight")),e.railYMarginHeight=r.toInt(o.css(e.scrollbarYRail,"marginTop"))+r.toInt(o.css(e.scrollbarYRail,"marginBottom")),o.css(e.scrollbarXRail,"display","none"),o.css(e.scrollbarYRail,"display","none"),i(t),s(t,"top",t.scrollTop),s(t,"left",t.scrollLeft),o.css(e.scrollbarXRail,"display",""),o.css(e.scrollbarYRail,"display",""))}},{"../lib/dom":3,"../lib/helper":6,"./instances":18,"./update-geometry":19,"./update-scroll":20}]},{},[1]); \ No newline at end of file diff --git a/assets/js/zzo.js b/assets/js/zzo.js index 21dcd8f..d8acf47 100644 --- a/assets/js/zzo.js +++ b/assets/js/zzo.js @@ -9,6 +9,7 @@ $(document).ready(function() { var position = $(window).scrollTop(); $(window).scroll(function () { var navbar = $('.navbar'); + var gtt = $('#gtt'); var scroll = $(window).scrollTop(); if (scroll > position) { // scroll down @@ -21,6 +22,10 @@ $(document).ready(function() { } else if (navbar.hasClass('navbar--show')) { navbar.removeClass('navbar--show'); } + + if (scroll > 500 && gtt.hasClass('hide')) { + gtt.removeClass('hide'); + } $(".single__contents :header").each(function () { if ($(window).scrollTop() >= $(this).position().top) { @@ -36,13 +41,16 @@ $(document).ready(function() { } }); } else { // scroll up - var navbar = $('.navbar'); if (navbar.hasClass('navbar--hide')) { navbar.removeClass('navbar--hide'); } else if (!navbar.hasClass('navbar--show')) { navbar.addClass('navbar--show'); } + if (scroll < 500 && !gtt.hasClass('hide')) { + gtt.addClass('hide'); + } + $(".single__contents :header").each(function () { if ($(window).scrollTop() >= $(this).position().top) { var id = $(this).attr('id'); @@ -61,7 +69,7 @@ $(document).ready(function() { }); // media query - enquire.register("screen and (max-width:769px)", { + enquire.register("screen and (max-width: 769px)", { match: function () { $('main').removeClass('main-main').removeClass('main').addClass('main'); $('aside').removeClass('main-side').removeClass('hide').addClass('hide'); @@ -77,6 +85,16 @@ $(document).ready(function() { setup: function () { }, deferSetup: true, destroy: function () { }, + }).register("screen and (max-width: 1120px)", { + match: function () { + $('#gtt').removeClass('hide').addClass('hide'); + }, + unmatch: function () { + $('#gtt').removeClass('hide'); + }, + setup: function () { }, + deferSetup: true, + destroy: function () { }, }); // navbar diff --git a/assets/sass/components/_gtt.scss b/assets/sass/components/_gtt.scss new file mode 100644 index 0000000..f93793e --- /dev/null +++ b/assets/sass/components/_gtt.scss @@ -0,0 +1,22 @@ +.gtt { + position: fixed; + right: 1rem; + bottom: 1rem; + width: 40px; + height: 40px; + border-radius: 50%; + cursor: pointer; + + @include flexbox(); + @include align-items(center); + @include justify-content(center); + @include themify($themes) { + color: themed('gtt-color'); + background-color: themed('gtt-background-color'); + + @include on-event { + color: themed('gtt-hover-color'); + background-color: themed('gtt-hover-background-color'); + } + } +} \ No newline at end of file diff --git a/assets/sass/components/_search.scss b/assets/sass/components/_search.scss index 46a03d0..ad01dbf 100644 --- a/assets/sass/components/_search.scss +++ b/assets/sass/components/_search.scss @@ -30,7 +30,7 @@ @include truncate(100%); @include themify($themes) { color: themed("search-color"); - background-color: themed("search-background-color"); + background-color: inherit; @include input-placeholder { font-family: $search_placeholder_font; color: themed("search-placeholder-color"); diff --git a/assets/sass/components/_summary.scss b/assets/sass/components/_summary.scss index e698d94..ad58d53 100644 --- a/assets/sass/components/_summary.scss +++ b/assets/sass/components/_summary.scss @@ -32,26 +32,28 @@ font-family: $summary_text_font; } - &__image-wrapper { - height: 100%; - width: auto; - margin: 0 auto; - padding: 1rem; - } - &__image { width: 100%; height: 100%; + + &-wrapper { + height: 100%; + width: auto; + margin: 0 auto; + padding: 1rem; + padding-bottom: 0; + } } .video { - padding: 0 1rem; - } - - .video-js { width: 100%; max-height: 500px; object-fit: contain; + + &-wrapper { + padding: 1rem; + padding-bottom: 0; + } } hr { diff --git a/assets/sass/components/_taxo.scss b/assets/sass/components/_taxo.scss index 52e1f6e..f93f3ae 100644 --- a/assets/sass/components/_taxo.scss +++ b/assets/sass/components/_taxo.scss @@ -3,6 +3,7 @@ margin: 1.5rem 0; &__title { + font-weight: 700; font-family: $taxo_titie_font; @include themify($themes) { color: themed('taxo-title-color'); diff --git a/assets/sass/components/_whoami.scss b/assets/sass/components/_whoami.scss new file mode 100644 index 0000000..a309615 --- /dev/null +++ b/assets/sass/components/_whoami.scss @@ -0,0 +1,32 @@ +.whoami { + padding: 1rem; + margin: 4rem 0; + border-radius: 0.25rem; + @include flexbox(); + @include themify($themes) { + border: 2px dashed themed('whoami-border-color'); + } + + &__image { + width: 100%; + height: 100%; + object-fit: contain; + + &-wrapper { + border-radius: 50%; + margin-right: 1rem; + min-width: 64px; + min-height: 64px; + max-width: 100px; + } + } + + &__title { + font-weight: 700; + margin-bottom: 0.5rem; + } + + &__desc { + + } +} \ No newline at end of file diff --git a/assets/sass/main.scss b/assets/sass/main.scss index d703c24..7597bce 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -106,6 +106,11 @@ $archive_meta_color: {{ $scr.Get "archive_meta_color" }}; $archive_key_background_color: {{ $scr.Get "archive_key_background_color" }}; $archive_type_background_color: {{ $scr.Get "archive_type_background_color" }}; $archive_hover_line_color: {{ $scr.Get "archive_hover_line_color" }}; +$gtt_color: {{ $scr.Get "gtt_color" }}; +$gtt_background_color: {{ $scr.Get "gtt_background_color" }}; +$gtt_hover_color: {{ $scr.Get "gtt_hover_color" }}; +$gtt_hover_background_color: {{ $scr.Get "gtt_hover_background_color" }}; +$whoami_border_color: {{ $scr.Get "whoami_border_color" }}; @import 'abstracts/variables'; @import 'abstracts/mixins'; @@ -137,6 +142,8 @@ $archive_hover_line_color: {{ $scr.Get "archive_hover_line_color" }}; @import 'components/alert'; @import 'components/attachment'; @import 'components/tooltip'; +@import 'components/gtt'; +@import 'components/whoami'; @import 'pages/body'; @import 'pages/home'; diff --git a/assets/sass/pages/_body.scss b/assets/sass/pages/_body.scss index 2a18450..92259aa 100644 --- a/assets/sass/pages/_body.scss +++ b/assets/sass/pages/_body.scss @@ -1,4 +1,5 @@ #body { + position: relative; @include themify($themes) { color: themed('body-color'); background-color: themed('backdrop-background-color'); diff --git a/assets/sass/prism/_hacker.scss b/assets/sass/prism/_hacker.scss index 2a2b2e2..6f70456 100644 --- a/assets/sass/prism/_hacker.scss +++ b/assets/sass/prism/_hacker.scss @@ -9,7 +9,7 @@ color: #fafafa !important; background: #2f2f2f; font-family: Consolas, Monaco, "Andale Mono", "Ubuntu Mono", monospace; - font-size: 1em; + font-size: 14px; line-height: 1.5em; -moz-tab-size: 4; diff --git a/assets/sass/prism/_solarized.scss b/assets/sass/prism/_solarized.scss index a66a650..8b4d29e 100644 --- a/assets/sass/prism/_solarized.scss +++ b/assets/sass/prism/_solarized.scss @@ -14,7 +14,7 @@ pre[class*="language-"], code[class*="language-"] { color: #5c6e74; - font-size: 13px; + font-size: 14px; text-shadow: none; font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; direction: ltr; diff --git a/assets/sass/themes/_custom.scss b/assets/sass/themes/_custom.scss index 2376634..425b63a 100644 --- a/assets/sass/themes/_custom.scss +++ b/assets/sass/themes/_custom.scss @@ -29,61 +29,66 @@ $custom: ( sidebar-title-color: $sidebar_title_color, sidebar-li-color: $sidebar_li_color, taxo-title-color: $taxo_title_color, - taxo-tags-background-color: $taxo_tags-background-color, - taxo-tags-color: $taxo-tags-color, - taxo-series-background-color: $taxo-series-background-color, - taxo-series-color: $taxo-series-color, - taxo-categories-background-color: $taxo-categories-background-color, - taxo-categories-color: $taxo-categories-color, - taxo-background-color-hover: $taxo-background-color-hover, - breadcrumb-item-color: $breadcrumb-item-color, - breadcrumb-background-color: $breadcrumb-background-color, - breadcrumb-item-active-color: $breadcrumb-item-active-color, - list-header-title-color: $list-header-title-color, - figcaption-color: $figcaption-color, - figcaption-strong-color: $figcaption-strong-color, - single-hr-background-color: $single-hr-background-color, - single-blockquote-border-color: $single-blockquote-border-color, - single-header-title-color: $single-header-title-color, - single-contents-title-color: $single-contents-title-color, - related-header-title-color: $related-header-title-color, - related-link-color: $related-link-color, - content-pre-main-color: $content-pre-main-color, - content-pre-background-color: $content-pre-background-color, - content-code-color: $content-code-color, - content-code-background-color: $content-code-background-color, - burger-menu-color: $burger-menu-color, - social-icon-color: $social-icon-color, - social-icon-hover-color: $social-icon-hover-color, - pagination-link-color: $pagination-link-color, - pagination-background-color: $pagination-background-color, - pagination-disabled-color: $pagination-disabled-color, - pagination-number-color: $pagination-number-color, - photoswipe-hover-color: $photoswipe-hover-color, - photoswipe-color: $photoswipe-color, - photoswipe-hover-background-color: $photoswipe-hover-background-color, - photoswipe-background-color: $photoswipe-background-color, - terms-title-color: $terms-title-color, - terms-tags-color: $terms-tags-color, - terms-categories-color: $terms-categories-color, - terms-series-color: $terms-series-color, - terms-len-color: $terms-len-color, - toc-label-color: $toc-label-color, - toc-title-color: $toc-title-color, - toc-vertical-line: $toc-vertical-line, - toc-vertical-line-active: $toc-vertical-line-active, - search-placeholder-color: $search-placeholder-color, - search-color: $search-color, - search-icon-color: $search-icon-color, - search-background-color: $search-background-color, - search-content-background-color: $search-content-background-color, - search-hover-background-color: $search-hover-background-color, - mark-color: $mark-color, - mark-background-color: $mark-background-color, - archive-key-color: $archive-key-color, - archive-type-color: $archive-type-color, - archive-meta-color: $archive-meta-color, - archive-key-background-color: $archive-key-background-color, - archive-type-background-color: $archive-type-background-color, - archive-hover-line-color: $archive-hover-line-color, + taxo-tags-background-color: $taxo_tags_background_color, + taxo-tags-color: $taxo_tags_color, + taxo-series-background-color: $taxo_series_background_color, + taxo-series-color: $taxo_series_color, + taxo-categories-background-color: $taxo_categories_background_color, + taxo-categories-color: $taxo_categories_color, + taxo-background-color-hover: $taxo_background_color_hover, + breadcrumb-item-color: $breadcrumb_item_color, + breadcrumb-background-color: $breadcrumb_background_color, + breadcrumb-item-active-color: $breadcrumb_item_active_color, + list-header-title-color: $list_header_title_color, + figcaption-color: $figcaption_color, + figcaption-strong-color: $figcaption_strong_color, + single-hr-background-color: $single_hr_background_color, + single-blockquote-border-color: $single_blockquote_border_color, + single-header-title-color: $single_header_title_color, + single-contents-title-color: $single_contents_title_color, + related-header-title-color: $related_header_title_color, + related-link-color: $related_link_color, + content-pre-main-color: $content_pre_main_color, + content-pre-background-color: $content_pre_background_color, + content-code-color: $content_code_color, + content-code-background-color: $content_code_background_color, + burger-menu-color: $burger_menu_color, + social-icon-color: $social_icon_color, + social-icon-hover-color: $social_icon_hover_color, + pagination-link-color: $pagination_link_color, + pagination-background-color: $pagination_background_color, + pagination-disabled-color: $pagination_disabled_color, + pagination-number-color: $pagination_number_color, + photoswipe-hover-color: $photoswipe_hover_color, + photoswipe-color: $photoswipe_color, + photoswipe-hover-background-color: $photoswipe_hover_background_color, + photoswipe-background-color: $photoswipe_background_color, + terms-title-color: $terms_title_color, + terms-tags-color: $terms_tags_color, + terms-categories-color: $terms_categories_color, + terms-series-color: $terms_series_color, + terms-len-color: $terms_len_color, + toc-label-color: $toc_label_color, + toc-title-color: $toc_title_color, + toc-vertical-line: $toc_vertical_line, + toc-vertical-line-active: $toc_vertical_line_active, + search-placeholder-color: $search_placeholder_color, + search-color: $search_color, + search-icon-color: $search_icon_color, + search-background-color: $search_background_color, + search-content-background-color: $search_content_background_color, + search-hover-background-color: $search_hover_background_color, + mark-color: $mark_color, + mark-background-color: $mark_background_color, + archive-key-color: $archive_key_color, + archive-type-color: $archive_type_color, + archive-meta-color: $archive_meta_color, + archive-key-background-color: $archive_key_background_color, + archive-type-background-color: $archive_type_background_color, + archive-hover-line-color: $archive_hover_line_color, + gtt-color: $gtt_color, + gtt-background-color: $gtt_background_color, + gtt-hover-color: $gtt_hover_color, + gtt-hover-background-color: $gtt_hover_background_color, + whoami-border-color: $whoami_border_color, ) !default; \ No newline at end of file diff --git a/assets/sass/themes/_dark.scss b/assets/sass/themes/_dark.scss index e8c9f55..6e928a7 100644 --- a/assets/sass/themes/_dark.scss +++ b/assets/sass/themes/_dark.scss @@ -87,4 +87,9 @@ $dark: ( archive-key-background-color: #FF6188, archive-type-background-color: #82aaff, archive-hover-line-color: #FF6188, + gtt-color: #bdbdbd, + gtt-background-color: #403E41, + gtt-hover-color: #82aaff, + gtt-hover-background-color: lighten(#403E41, 5%), + whoami-border-color: #90a4ae, ); \ No newline at end of file diff --git a/assets/sass/themes/_hacker.scss b/assets/sass/themes/_hacker.scss index 7735c0e..e1956af 100644 --- a/assets/sass/themes/_hacker.scss +++ b/assets/sass/themes/_hacker.scss @@ -58,7 +58,7 @@ $hacker: ( burger-menu-color: $primary-color, social-icon-color: #9e9e9e, social-icon-hover-color: darken(#9e9e9e, 20%), - pagination-link-color: #7B4D94, + pagination-link-color: #996287, pagination-background-color: #252526, pagination-disabled-color: #424242, pagination-number-color: #FCFCFA, @@ -90,4 +90,9 @@ $hacker: ( archive-key-background-color: #E08C48, archive-type-background-color: #855E78, archive-hover-line-color: #FF6188, + gtt-color: #9e9e9e, + gtt-background-color: #403e41, + gtt-hover-color: #E3CD26, + gtt-hover-background-color: lighten(#403e41, 5%), + whoami-border-color: #996287, ); \ No newline at end of file diff --git a/assets/sass/themes/_light.scss b/assets/sass/themes/_light.scss index bb05b51..f75856c 100644 --- a/assets/sass/themes/_light.scss +++ b/assets/sass/themes/_light.scss @@ -28,14 +28,14 @@ $light: ( navbar-dropdown-item-hover-background-color: #bdbdbd, sidebar-title-color: #424242, sidebar-li-color: #424242, - taxo-title-color: #424242, - taxo-tags-background-color: #9e9e9e, - taxo-tags-color: #eeeeee, - taxo-series-background-color: #9e9e9e, - taxo-series-color: #eeeeee, - taxo-categories-background-color: #9e9e9e, - taxo-categories-color: #eeeeee, - taxo-background-color-hover: darken(#9e9e9e, 5%), + taxo-title-color: #607d8b, + taxo-tags-background-color: #eeeeee, + taxo-tags-color: #424242, + taxo-series-background-color: #eeeeee, + taxo-series-color: #424242, + taxo-categories-background-color: #eeeeee, + taxo-categories-color: #424242, + taxo-background-color-hover: darken(#eeeeee, 5%), breadcrumb-item-color: #424242, breadcrumb-background-color: #eeeeee, breadcrumb-item-active-color: #bdbdbd, @@ -72,13 +72,13 @@ $light: ( toc-title-color: #727072, toc-vertical-line: #727072, toc-vertical-line-active: #FF6188, - search-placeholder-color: #eeeeee, - search-color: #FCFCFA, - search-icon-color: #eeeeee, - search-background-color: #9e9e9e, - search-content-color: #FCFCFA, - search-content-background-color: #9e9e9e, - search-hover-background-color: darken(#9e9e9e, 10%), + search-placeholder-color: #bdbdbd, + search-color: #424242, + search-icon-color: #bdbdbd, + search-background-color: #eeeeee, + search-content-color: #424242, + search-content-background-color: #eeeeee, + search-hover-background-color: darken(#eeeeee, 10%), mark-color: #FCFCFA, mark-background-color: #FF6188, archive-key-color: #FCFCFA, @@ -87,4 +87,9 @@ $light: ( archive-key-background-color: #607d8b, archive-type-background-color: #bdbdbd, archive-hover-line-color: #FF6188, + gtt-color: #424242, + gtt-background-color: #FCFCFA, + gtt-hover-color: #607d8b, + gtt-hover-background-color: darken(#FCFCFA, 5%), + whoami-border-color: #607d8b, ); \ No newline at end of file diff --git a/assets/sass/themes/_solarized.scss b/assets/sass/themes/_solarized.scss index 705e148..8e50f1c 100644 --- a/assets/sass/themes/_solarized.scss +++ b/assets/sass/themes/_solarized.scss @@ -9,7 +9,7 @@ $solarized: ( title-color: $primary-color, meta-color: lighten($primary-color, 5%), body-color: #424242, - hr-color: #ffb300, + hr-color: $secondary-color, body-background-color: #FDF7E3, backdrop-background-color: #DDD6C7, dropdown-border-color: $primary-color, @@ -90,4 +90,9 @@ $solarized: ( archive-key-background-color: $primary-color, archive-type-background-color: $secondary-color, archive-hover-line-color: #FF6188, + gtt-color: $secondary-color, + gtt-background-color: #FBF1D1, + gtt-hover-color: $primary-color, + gtt-hover-background-color: darken(#FBF1D1, 5%), + whoami-border-color: $primary-color, ); \ No newline at end of file diff --git a/data/_config/_default/params.toml b/data/_config/_default/params.toml index 0ea014d..d1755ef 100644 --- a/data/_config/_default/params.toml +++ b/data/_config/_default/params.toml @@ -5,7 +5,6 @@ custom_js = ["js/custom.js"] # body enableToc = true enableBreadcrumb = true -enableCustomScrollbar = true enablePhotoSwipe = true enableSearch = true enableMark = true @@ -21,13 +20,14 @@ showFeedLinks = true showSocialLinks = true enableLangChange = true enableThemeChange = true -themeOptions = ["custom", "dark", "light", "hacker", "solarized"] +themeOptions = ["dark", "light", "hacker", "solarized", "custom"] [marketing] google_analytics = "" google_tag_manager = "" [socialOptions] + email = "mailto:your@email.com" facebook = "http://example.org/" twitter = "http://example.org/" github = "http://example.org/" @@ -38,5 +38,5 @@ themeOptions = ["custom", "dark", "light", "hacker", "solarized"] medium = "" tumblr = "" linkedin = "" - pinterest = "http://example.org/" + pinterest = "" stack-exchange = "" \ No newline at end of file diff --git a/data/skin.toml b/data/skin.toml index 772bea4..43d9680 100644 --- a/data/skin.toml +++ b/data/skin.toml @@ -1,88 +1,93 @@ -footer_background_color = "#eeeeee" -footer_color = "#424242" -link = "#607d8b" -link_hover = "#FF6188" -title_color = "#607d8b" -meta_color = "#424242" -body_color = "#424242" -hr_color = "#fcfcfa" -body_background_color = "#fafafa" -backdrop_background_color = "#e0e0e0" -dropdown_border_color = "#bdbdbd" -dropdown_border_top_color = "#e0e0e0" -dropdown_item_active_background_color = "#e0e0e0" -dropdown_title_background_color = "#fafafa" -dropdown_content_background_color = "#fafafa" -dropdown_footer_item_color = "#424242" -dropdown_item_hover_background_color = "#bdbdbd" -dropdown_item_hover_color = "#fcfcfa" -dropdown_item_color = "#424242" -navbar_border_bottom_color = "#e0e0e0" -navbar_background_color = "#eeeeee" -navbar_title_color = "#424242" -navbar_title_hover_color = "#607d8b" -navbar_title_active_color = "#FF6188" -navbar_menu_hover_background_color = "#e1e1e1" -navbar_dropdown_item_hover_color = "#607d8b" -navbar_dropdown_item_hover_background_color = "#bdbdbd" -sidebar_title_color = "#424242" -sidebar_li_color = "#424242" -taxo_title_color = "#424242" -taxo_tags_background_color = "#9e9e9e" -taxo_tags_color = "#eeeeee" -taxo_series_background_color = "#9e9e9e" -taxo_series_color = "#eeeeee" -taxo_categories_background_color = "#9e9e9e" -taxo_categories_color = "#eeeeee" -taxo_background_color_hover = "#919191" -breadcrumb_item_color = "#424242" -breadcrumb_background_color = "#eeeeee" -breadcrumb_item_active_color = "#bdbdbd" -list_header_title_color = "#424242" -figcaption_color = "#bdbdbd" -figcaption_strong_color = "#424242" -single_hr_background_color = "#bdbdbd" -single_blockquote_border_color = "#bdbdbd" -single_header_title_color = "#424242" -single_contents_title_color = "#607d8b" -related_header_title_color = "#424242" -related_link_color = "#607d8b" -content_pre_main_color = "#607d8b" -content_pre_background_color = "#F5F2F0" -content_code_color = "#212121" -content_code_background_color = "#F5F2F0" -burger_menu_color = "#9e9e9e" -social_icon_color = "#9e9e9e" -social_icon_hover_color = "#6b6b6b" -pagination_link_color = "#424242" -pagination_background_color = "#eeeeee" -pagination_disabled_color = "#bdbdbd" -pagination_number_color = "#757575" -photoswipe_hover_color = "#fcfcfa" -photoswipe_color = "#fcfcfa" -photoswipe_hover_background_color = "#727072" -photoswipe_background_color = "#403E41" -terms_title_color = "#9e9e9e" -terms_tags_color = "#424242" -terms_categories_color = "#424242" -terms_series_color = "#424242" -terms_len_color = "#727072" -toc_label_color = "#727072" -toc_title_color = "#727072" -toc_vertical_line = "#727072" -toc_vertical_line_active = "#FF6188" -search_placeholder_color = "#eeeeee" -search_color = "#fcfcfa" -search_icon_color = "#eeeeee" -search_background_color = "#9e9e9e" -search_content_color = "#fcfcfa" -search_content_background_color = "#9e9e9e" -search_hover_background_color = "#848484" -mark_color = "#fcfcfa" -mark_background_color = "#FF6188" -archive_key_color = "#fcfcfa" -archive_meta_color = "#424242" -archive_type_color = "#575757" -archive_key_background_color = "#607d8b" -archive_type_background_color = "#bdbdbd" -archive_hover_line_color = "#FF6188" \ No newline at end of file +footer_background_color = "inherit" +footer_color = "inherit" +link = "inherit" +link_hover = "inherit" +title_color = "inherit" +meta_color = "inherit" +body_color = "inherit" +hr_color = "inherit" +body_background_color = "inherit" +backdrop_background_color = "inherit" +dropdown_border_color = "inherit" +dropdown_border_top_color = "inherit" +dropdown_item_active_background_color = "inherit" +dropdown_title_background_color = "inherit" +dropdown_content_background_color = "inherit" +dropdown_footer_item_color = "inherit" +dropdown_item_hover_background_color = "inherit" +dropdown_item_hover_color = "inherit" +dropdown_item_color = "inherit" +navbar_border_bottom_color = "inherit" +navbar_background_color = "inherit" +navbar_title_color = "inherit" +navbar_title_hover_color = "inherit" +navbar_title_active_color = "inherit" +navbar_menu_hover_background_color = "inherit" +navbar_dropdown_item_hover_color = "inherit" +navbar_dropdown_item_hover_background_color = "inherit" +sidebar_title_color = "inherit" +sidebar_li_color = "inherit" +taxo_title_color = "inherit" +taxo_tags_background_color = "inherit" +taxo_tags_color = "inherit" +taxo_series_background_color = "inherit" +taxo_series_color = "inherit" +taxo_categories_background_color = "inherit" +taxo_categories_color = "inherit" +taxo_background_color_hover = "inherit" +breadcrumb_item_color = "inherit" +breadcrumb_background_color = "inherit" +breadcrumb_item_active_color = "inherit" +list_header_title_color = "inherit" +figcaption_color = "inherit" +figcaption_strong_color = "inherit" +single_hr_background_color = "inherit" +single_blockquote_border_color = "inherit" +single_header_title_color = "inherit" +single_contents_title_color = "inherit" +related_header_title_color = "inherit" +related_link_color = "inherit" +content_pre_main_color = "inherit" +content_pre_background_color = "inherit" +content_code_color = "inherit" +content_code_background_color = "inherit" +burger_menu_color = "inherit" +social_icon_color = "inherit" +social_icon_hover_color = "inherit" +pagination_link_color = "inherit" +pagination_background_color = "inherit" +pagination_disabled_color = "inherit" +pagination_number_color = "inherit" +photoswipe_hover_color = "inherit" +photoswipe_color = "inherit" +photoswipe_hover_background_color = "inherit" +photoswipe_background_color = "inherit" +terms_title_color = "black" +terms_tags_color = "inherit" +terms_categories_color = "inherit" +terms_series_color = "inherit" +terms_len_color = "inherit" +toc_label_color = "inherit" +toc_title_color = "inherit" +toc_vertical_line = "inherit" +toc_vertical_line_active = "inherit" +search_placeholder_color = "inherit" +search_color = "inherit" +search_icon_color = "inherit" +search_background_color = "inherit" +search_content_color = "inherit" +search_content_background_color = "inherit" +search_hover_background_color = "inherit" +mark_color = "inherit" +mark_background_color = "inherit" +archive_key_color = "inherit" +archive_meta_color = "inherit" +archive_type_color = "inherit" +archive_key_background_color = "inherit" +archive_type_background_color = "inherit" +archive_hover_line_color = "inherit" +gtt_color = "inherit" +gtt_background_color = "inherit" +gtt_hover_color = "inherit" +gtt_hover_background_color = "inherit" +whoami_border_color = "inherit" \ No newline at end of file diff --git a/exampleSite/assets/css/photoswipe/custom-skin.css b/exampleSite/assets/css/photoswipe/custom-skin.css index 540d979..91ca289 100644 --- a/exampleSite/assets/css/photoswipe/custom-skin.css +++ b/exampleSite/assets/css/photoswipe/custom-skin.css @@ -56,7 +56,7 @@ .pswp__button, .pswp__button--arrow--left:before, .pswp__button--arrow--right:before { - background: url(/theme/hugo-theme-zzo/images/photoswipe/default-skin.png) 0 0 no-repeat; + background: url(images/photoswipe/default-skin.png) 0 0 no-repeat; background-size: 264px 88px; width: 44px; height: 44px; @@ -71,7 +71,7 @@ .pswp--svg .pswp__button, .pswp--svg .pswp__button--arrow--left:before, .pswp--svg .pswp__button--arrow--right:before { - background-image: url(/theme/hugo-theme-zzo/images/photoswipe/default-skin.svg); + background-image: url(images/photoswipe/default-skin.svg); } .pswp--svg .pswp__button--arrow--left, diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 183990c..a0ee071 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -25,16 +25,20 @@ rssLimit = 100 [params] description = "The Zzo theme for Hugo example site." - custom_css = [] + custom_css = ["css/custom.css", "scss/custom.scss"] + custom_js = ["js/custom.js"] + myname = "yourname" + whoami = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In sit amet cursus massa. Vestibulum eu posuere est. Suspendisse erat purus, mollis in leo quis, hendrerit fringilla felis." # body enableToc = true enableBreadcrumb = true - enableCustomScrollbar = true enablePhotoSwipe = true enableSearch = true enableMark = true - + enableGoToTop = true + enableWhoami = true + # sidebar enableSidebarTags = true enableSidebarSeries = true @@ -46,9 +50,15 @@ rssLimit = 100 showSocialLinks = true enableLangChange = true enableThemeChange = true - themeOptions = ["dark", "light", "hacker", "solarized"] + themeOptions = ["dark", "light", "hacker", "solarized", "custom"] + + # comment + enableComment = false + disqus_shortname = "" + commento = false [params.socialOptions] + email = "mailto:your@email.com" facebook = "http://example.org" twitter = "http://example.org" github = "http://example.org" @@ -59,7 +69,7 @@ rssLimit = 100 medium = "" tumblr = "" linkedin = "" - pinterest = "http://example.org" + pinterest = "" stack-exchange = "" [marketing] diff --git a/exampleSite/content/about/index.md b/exampleSite/content/about/index.md index 2947f22..182343f 100644 --- a/exampleSite/content/about/index.md +++ b/exampleSite/content/about/index.md @@ -1,6 +1,6 @@ +++ title = "About" -desc = "Hugo, the world’s fastest framework for building websites" +description = "Hugo, the world’s fastest framework for building websites" type = "about" date = "2019-02-28" +++ diff --git a/exampleSite/content/gallery/cartoon/index.ko.md b/exampleSite/content/gallery/cartoon/index.ko.md index 095c76a..0b47714 100644 --- a/exampleSite/content/gallery/cartoon/index.ko.md +++ b/exampleSite/content/gallery/cartoon/index.ko.md @@ -2,5 +2,5 @@ title: "Cartoon" date: 2018-10-11T10:20:16+09:00 type: "gallery" -desc: "cartoon gallery" +description: "cartoon gallery" --- diff --git a/exampleSite/content/gallery/cartoon/index.md b/exampleSite/content/gallery/cartoon/index.md index 095c76a..0b47714 100644 --- a/exampleSite/content/gallery/cartoon/index.md +++ b/exampleSite/content/gallery/cartoon/index.md @@ -2,5 +2,5 @@ title: "Cartoon" date: 2018-10-11T10:20:16+09:00 type: "gallery" -desc: "cartoon gallery" +description: "cartoon gallery" --- diff --git a/exampleSite/content/gallery/photo/index.ko.md b/exampleSite/content/gallery/photo/index.ko.md index 5df169f..3709e31 100644 --- a/exampleSite/content/gallery/photo/index.ko.md +++ b/exampleSite/content/gallery/photo/index.ko.md @@ -2,5 +2,5 @@ title: "Photo" date: 2018-10-12T10:20:16+09:00 type: "gallery" -desc: "포토 갤러리" +description: "포토 갤러리" --- diff --git a/exampleSite/content/gallery/photo/index.md b/exampleSite/content/gallery/photo/index.md index a4c42c8..2b058ac 100644 --- a/exampleSite/content/gallery/photo/index.md +++ b/exampleSite/content/gallery/photo/index.md @@ -2,5 +2,5 @@ title: "Photo" date: 2018-10-12T10:20:16+09:00 type: "gallery" -desc: "photo gallery" +description: "photo gallery" --- diff --git a/exampleSite/content/notes/hugo/hugo-1.md b/exampleSite/content/notes/hugo/hugo-1.md index f091b5d..feeea7a 100644 --- a/exampleSite/content/notes/hugo/hugo-1.md +++ b/exampleSite/content/notes/hugo/hugo-1.md @@ -1,7 +1,7 @@ --- title: "Hugo 1" date: 2017-10-11T10:33:41+09:00 -desc: "Hugo 1 Description" +description: "Hugo 1 Description" tags: - hugo series: diff --git a/exampleSite/content/notes/sublist/go/go-1/go-1-1/go-1-1-1/go-5.md b/exampleSite/content/notes/sublist/go/go-1/go-1-1/go-1-1-1/go-5.md index b6731b2..77634d4 100644 --- a/exampleSite/content/notes/sublist/go/go-1/go-1-1/go-1-1-1/go-5.md +++ b/exampleSite/content/notes/sublist/go/go-1/go-1-1/go-1-1-1/go-5.md @@ -1,7 +1,7 @@ --- title: "Go 5" date: 2012-11-01T10:33:41+09:00 -desc: "Go 5 Description" +description: "Go 5 Description" tags: - series: diff --git a/exampleSite/content/notes/sublist/go/go-1/go-1-1/go-1.md b/exampleSite/content/notes/sublist/go/go-1/go-1-1/go-1.md index 621ed70..aafcead 100644 --- a/exampleSite/content/notes/sublist/go/go-1/go-1-1/go-1.md +++ b/exampleSite/content/notes/sublist/go/go-1/go-1-1/go-1.md @@ -1,7 +1,7 @@ --- title: "Go 1" date: 2012-11-01T10:33:41+09:00 -desc: "Go 1 Description" +description: "Go 1 Description" tags: - series: diff --git a/exampleSite/content/notes/sublist/go/go-1/go-2.md b/exampleSite/content/notes/sublist/go/go-1/go-2.md index d367582..4ebd079 100644 --- a/exampleSite/content/notes/sublist/go/go-1/go-2.md +++ b/exampleSite/content/notes/sublist/go/go-1/go-2.md @@ -1,7 +1,7 @@ --- title: "Go 2" date: 2012-11-01T10:33:41+09:00 -desc: "Go 2 Description" +description: "Go 2 Description" tags: - series: diff --git a/exampleSite/content/notes/sublist/go/go-4.md b/exampleSite/content/notes/sublist/go/go-4.md index ead208f..7c90532 100644 --- a/exampleSite/content/notes/sublist/go/go-4.md +++ b/exampleSite/content/notes/sublist/go/go-4.md @@ -1,7 +1,7 @@ --- title: "Go 4" date: 2012-11-01T10:33:41+09:00 -desc: "Go 4 Description" +description: "Go 4 Description" tags: - series: diff --git a/exampleSite/content/notes/sublist/post-1/index.md b/exampleSite/content/notes/sublist/post-1/index.md index 042b051..23658b2 100644 --- a/exampleSite/content/notes/sublist/post-1/index.md +++ b/exampleSite/content/notes/sublist/post-1/index.md @@ -12,7 +12,7 @@ categories: - cTest featured_video: "1.mp4" featured_video_poster: "1.jpg" -desc: "this is description" +description: "this is description" --- post-1 content diff --git a/exampleSite/content/notes/sublist/post-2.md b/exampleSite/content/notes/sublist/post-2.md index 0106731..b3df348 100644 --- a/exampleSite/content/notes/sublist/post-2.md +++ b/exampleSite/content/notes/sublist/post-2.md @@ -10,7 +10,7 @@ tags: categories: - cTest featured_image: "tree.jpg" -desc: "this is description2" +description: "this is description2" --- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut eget enim lobortis, bibendum massa et, bibendum enim. Nunc eu augue quis ante porta sodales. Mauris vel faucibus magna, dictum sagittis dolor. Nam scelerisque malesuada efficitur. Donec consequat sodales justo, ut aliquam ligula maximus nec. \ No newline at end of file diff --git a/exampleSite/content/posts/math-typesetting.mmark b/exampleSite/content/posts/math-typesetting.mmark index 7f421ae..71cf582 100644 --- a/exampleSite/content/posts/math-typesetting.mmark +++ b/exampleSite/content/posts/math-typesetting.mmark @@ -42,5 +42,4 @@ Block math: $$ \varphi = 1+\frac{1} {1+\frac{1} {1+\frac{1} {1+\cdots} } } -$$ - +$$ \ No newline at end of file diff --git a/exampleSite/layouts/_default/summary.html b/exampleSite/layouts/_default/summary.html index 1e5d0d9..067b53b 100644 --- a/exampleSite/layouts/_default/summary.html +++ b/exampleSite/layouts/_default/summary.html @@ -6,7 +6,7 @@ {{ $params := .Params }}
- {{ with $params.Desc }} + {{ with $params.Description }} {{ . }} {{ else }} {{ .Summary }} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 415f6f6..2675af3 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -9,7 +9,7 @@ {{ partial "head/styles" . }} {{ partial "head/meta" . }} {{ partial "head/meta_json_ld" . }} - {{ partial "head/service" }} + {{ partial "head/service" . }} @@ -21,6 +21,7 @@ {{ partial "footer/site-footer" . }}
+ {{ partial "etc/go-to-top" . }} \ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 463acaf..382b075 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -11,12 +11,13 @@
{{ .Content }}
+ {{ partial "body/whoami" . }} + {{ partial "comments/comments.html" . }} {{ partial "body/related" . }} {{ partial "pagination/pagination-single" . }} {{ partial "body/photoswipe" . }} - {{ partial "body/perfectscrollbar" . }}