From c2c7aa79051d1d803753153ed8acd6ece8bfad71 Mon Sep 17 00:00:00 2001 From: Raivis Vitols Date: Thu, 29 Dec 2016 17:34:49 +0200 Subject: [PATCH] Updating theme - version 4.0.0 - fonts, conditional comments, prev & next posts, share buttons --- README.md | 8 +- assets/css/styles.css | 2 +- package.json | 2 +- partials/comments.hbs | 26 ++-- partials/post-meta.hbs | 2 - partials/post-share.hbs | 12 +- partials/prev-next.hbs | 47 ++++++ post.hbs | 6 +- source/sass/components/_author-page.scss | 2 +- source/sass/components/_disqus-comments.scss | 8 ++ source/sass/components/_page-title.scss | 2 +- source/sass/components/_post-list.scss | 2 +- source/sass/components/_post-view-meta.scss | 19 --- source/sass/components/_post-view-share.scss | 20 --- source/sass/components/_post-view.scss | 134 ++++++++++++++++-- .../components/_sidebar-blog-description.scss | 12 -- .../sass/components/_sidebar-blog-title.scss | 10 -- .../components/_sidebar-contact-links.scss | 15 -- source/sass/components/_sidebar-header.scss | 36 ----- .../sass/components/_sidebar-navigation.scss | 17 --- .../components/_sidebar-promotion-links.scss | 16 --- source/sass/components/_site-sidebar.scss | 112 +++++++++++++++ source/sass/elements/_elements.scss | 6 +- source/sass/styles.scss | 9 -- source/sass/tools/_mixins.scss | 4 +- 25 files changed, 331 insertions(+), 198 deletions(-) create mode 100644 partials/prev-next.hbs delete mode 100644 source/sass/components/_post-view-meta.scss delete mode 100644 source/sass/components/_post-view-share.scss delete mode 100644 source/sass/components/_sidebar-blog-description.scss delete mode 100644 source/sass/components/_sidebar-blog-title.scss delete mode 100644 source/sass/components/_sidebar-contact-links.scss delete mode 100644 source/sass/components/_sidebar-header.scss delete mode 100644 source/sass/components/_sidebar-navigation.scss delete mode 100644 source/sass/components/_sidebar-promotion-links.scss diff --git a/README.md b/README.md index f359858..e062232 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ -# Willow Ghost Theme 3.0 +# Willow Ghost Theme 4.0 -Personal, responsive, minimalist and open-source theme for Ghost blogging platform. -Lightweight - only 2.9KB of CSS and 820B of JavaScript. No jQuery, vanilla JS only. -Version 2.0 comes with SASS in BEM style using ITCSS (http://itcss.io/) architecture. +Personal, responsive, minimalist and open-source theme for Ghost blogging platform. Lightweight - only 3KB of CSS and 820B of JavaScript. No jQuery, vanilla JS only. Starting version 2.0 theme is built with SASS in BEM style using ITCSS (http://itcss.io/) architecture. ![Willow Ghost Theme](http://i.imgur.com/a8WfkoS.png) @@ -27,4 +25,4 @@ Edit the `content/themes/[theme-folder]/partials/sidebar.hbs` file. 1. Edit the `content/themes/[theme-folder]/post.hbs` file, uncomment "comments" partial inclusion. -2. Replace Disqus embed code with your site code - https://disqus.com/admin/universalcode/ +2. Replace Disqus embed code with your site code - https://disqus.com/admin/universalcode/. Edit `content/themes/[theme-folder]/partials/comments.hbs` file and replace `loadDisqusComments` function body with Disqus embed code function body. diff --git a/assets/css/styles.css b/assets/css/styles.css index 1dbfc8a..dcc51d4 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -1 +1 @@ -/*! normalize.css v4.1.1 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block}audio:not([controls]){display:none;height:0}progress{vertical-align:baseline}template,[hidden]{display:none}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit;font-weight:bolder}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}svg:not(:root){overflow:hidden}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}button,input,select,textarea{font:inherit;margin:0}optgroup{font-weight:700}button,input{overflow:visible}button,select{text-transform:none}button,html [type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0}button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:1px dotted ButtonText}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}textarea{overflow:auto}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px}[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-input-placeholder{color:inherit;opacity:.54}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}*{box-sizing:border-box}body,html{height:100%}body{color:#555;font-size:16px;min-width:320px;line-height:1.5;background:#f7f7f7;font-family:'Merriweather', serif}a{outline:none;color:#555;-webkit-transition:all 150ms ease-in-out;-moz-transition:all 150ms ease-in-out;-ms-transition:all 150ms ease-in-out;-o-transition:all 150ms ease-in-out;transition:all 150ms ease-in-out;text-decoration:none}a:hover{color:#888}h1{margin:0;font-size:1.4em}h2{margin:0;font-size:1.2em}h3{margin:0;font-size:1em}.c-site-wrapper{width:100%;height:100%;overflow-x:hidden;overflow-y:scroll;-webkit-overflow-scrolling:touch}.c-site-viewport{width:100%;-webkit-transform:translateX(0);-moz-transform:translateX(0);-ms-transform:translateX(0);-o-transform:translateX(0);transform:translateX(0)}@media (max-width: 640px){.c-site-viewport{-webkit-transition:300ms;-moz-transition:300ms;-ms-transition:300ms;-o-transition:300ms;transition:300ms}}@media (max-width: 640px){[data-menu-visible="1"] .c-site-viewport{-webkit-transform:translateX(300px);-moz-transform:translateX(300px);-ms-transform:translateX(300px);-o-transform:translateX(300px);transform:translateX(300px)}}.c-site-sidebar{width:300px;height:100%;position:absolute;top:0;z-index:1;text-align:center}@media (min-width: 641px){.c-site-sidebar{left:0}}@media (max-width: 640px){.c-site-sidebar{left:-300px}}.c-site-content{min-height:100vh;max-width:1000px;background:#fff;border-left:1px solid #eaeaea;border-right:1px solid #eaeaea}@media (max-width: 640px){.c-site-content{padding:20px}}@media (min-width: 641px){.c-site-content{padding:30px;margin-left:300px}}.c-mobile-header{margin-bottom:30px;padding-bottom:25px;border-bottom:1px solid #eaeaea}@media (min-width: 641px){.c-mobile-header{display:none}}.c-mobile-header__link,.c-mobile-header__logo,.c-mobile-header__logo__image{height:40px;line-height:40px}.c-mobile-header__link{font-weight:bold}.c-mobile-header__logo{float:right}.c-mobile-header__logo__image{width:40px;height:40px;-webkit-border-radius:20px;-moz-border-radius:20px;-ms-border-radius:20px;-o-border-radius:20px;border-radius:20px}.c-error-message{line-height:2;text-align:center;color:#888}.c-sidebar-header{height:100px;position:relative;margin-bottom:65px;-webkit-background-size:cover;-moz-background-size:cover;-ms-background-size:cover;-o-background-size:cover;background-size:cover;background-position:50% 50%}.c-sidebar-header__link,.c-sidebar-header__image{width:80px;height:80px;display:block}.c-sidebar-header__image{-webkit-border-radius:40px;-moz-border-radius:40px;-ms-border-radius:40px;-o-border-radius:40px;border-radius:40px;border:2px solid #fff}.c-sidebar-header__link{left:50%;bottom:-40px;z-index:1;position:absolute;margin-left:-40px}.c-sidebar-blog-title{padding:0 15px;font-size:1.2em;margin-bottom:20px}.c-sidebar-blog-description{padding:0 20px;font-size:0.8em;color:#888;margin-bottom:20px;font-weight:normal}.c-sidebar-contact-links{font-size:0.8em;margin-bottom:20px;padding:0 15px 20px;border-bottom:1px solid #eaeaea}.c-sidebar-contact-links__item{padding:0 5px}.c-sidebar-navigation{font-size:0.9em;margin-bottom:20px;padding:0 15px 20px;border-bottom:1px solid #eaeaea}.c-sidebar-navigation__item{padding:5px;font-weight:bold;display:inline-block}.c-sidebar-promotion-links{font-size:0.8em;margin-bottom:20px;padding-bottom:20px;border-bottom:1px solid #eaeaea}.c-sidebar-promotion-links__item{padding:5px 15px;display:block}.c-post-list__item{margin-bottom:35px;padding-bottom:20px;border-bottom:1px solid #eaeaea}@media (min-width: 1200px){.c-post-list__item{width:31.33333%;float:left;margin-right:3%}.c-post-list__item:nth-child(3n){margin-right:0}.c-post-list__item:nth-child(3n+1){clear:left}}@media (max-width: 1199px) and (min-width: 880px){.c-post-list__item{width:48%;float:left;margin-right:4%}.c-post-list__item:nth-child(2n){margin-right:0}.c-post-list__item:nth-child(2n+1){clear:left}}.c-post-list__image{display:block;margin-bottom:15px}.c-post-list__image:hover{opacity:0.8}.c-post-list__image__img{width:100%;display:block}.c-post-list__title{font-size:1.1em;line-height:1.4;margin-bottom:10px}.c-post-list__meta{font-size:0.8em;font-style:italic;color:#888}.c-post-list__meta__tags{text-transform:lowercase}.c-post-view__footer{text-align:center;margin-top:40px;padding:40px 0 10px;border-top:1px solid #eaeaea}.c-post-view--narrow{text-align:center;max-width:610px;margin:0 auto}.c-post-view-meta{line-height:2;font-size:0.8em;font-style:italic;color:#888}.c-post-view-meta__tags{text-transform:lowercase}.c-page-title__heading+.c-post-view-meta{margin-top:20px}.c-post-view-share{font-weight:bold}.c-post-view-share__item--twitter{color:#4099FF}.c-post-view-share__item--facebook{color:#3B5998}.c-post-view-share__item--google{color:#d34836}.c-post-pagination__item--older{float:right}.c-page-title{text-align:center;margin-bottom:40px;padding:10px 0 40px 0;border-bottom:1px solid #eaeaea}.c-page-title__heading__tag{text-transform:lowercase}.c-author-page{text-align:center;margin-bottom:40px;padding:10px 0 40px;border-bottom:1px solid #eaeaea}.c-author-page__image{margin-bottom:20px}.c-author-page__image__src{width:100px;height:100px;display:block;margin:0 auto;-webkit-border-radius:50px;-moz-border-radius:50px;-ms-border-radius:50px;-o-border-radius:50px;border-radius:50px}.c-author-page__bio{max-width:600px;font-size:0.9em;color:#888;font-weight:normal;margin:20px auto 0}.c-author-page__meta{margin-top:20px;font-size:0.9em;color:#888}.c-disqus-comments{margin-top:30px;padding-top:30px;border-top:1px solid #eaeaea}.clear:after,.c-mobile-header:after,.c-post-list:after,.c-post-pagination:after{content:"";clear:both;display:table}.markdown,.c-post-view__content{line-height:2}.markdown h1,.c-post-view__content h1,.markdown h2,.c-post-view__content h2,.markdown h3,.c-post-view__content h3,.markdown p,.c-post-view__content p,.markdown ul,.c-post-view__content ul,.markdown blockquote,.c-post-view__content blockquote,.markdown pre,.c-post-view__content pre,.markdown .gist,.c-post-view__content .gist{margin-bottom:30px;word-wrap:break-word}.markdown h1:last-child,.c-post-view__content h1:last-child,.markdown h2:last-child,.c-post-view__content h2:last-child,.markdown h3:last-child,.c-post-view__content h3:last-child,.markdown p:last-child,.c-post-view__content p:last-child,.markdown ul:last-child,.c-post-view__content ul:last-child,.markdown blockquote:last-child,.c-post-view__content blockquote:last-child,.markdown pre:last-child,.c-post-view__content pre:last-child,.markdown .gist:last-child,.c-post-view__content .gist:last-child{margin-bottom:0}.markdown ul,.c-post-view__content ul{padding-left:3em}.markdown a,.c-post-view__content a{text-decoration:underline}.markdown a:hover,.c-post-view__content a:hover{text-decoration:none}.markdown a:hover img,.c-post-view__content a:hover img{opacity:0.8}.markdown img,.c-post-view__content img{width:100%;-webkit-transition:all 150ms ease-in-out;-moz-transition:all 150ms ease-in-out;-ms-transition:all 150ms ease-in-out;-o-transition:all 150ms ease-in-out;transition:all 150ms ease-in-out}.markdown img.inline,.c-post-view__content img.inline{width:auto;display:inline-block}.markdown blockquote,.c-post-view__content blockquote{padding-left:30px;font-style:italic;border-left:4px solid #eaeaea}.markdown hr,.c-post-view__content hr{border:0;height:1px;margin:30px 0;background:#eaeaea}.markdown pre,.c-post-view__content pre{padding:1em;overflow:auto;font-size:0.9em;line-height:1.5;background:#f7f7f7}.markdown code,.c-post-view__content code{background:#f7f7f7}.markdown .gist .gist-file,.c-post-view__content .gist .gist-file{margin-bottom:0} +/*! normalize.css v4.1.1 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block}audio:not([controls]){display:none;height:0}progress{vertical-align:baseline}template,[hidden]{display:none}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit;font-weight:bolder}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}svg:not(:root){overflow:hidden}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}button,input,select,textarea{font:inherit;margin:0}optgroup{font-weight:700}button,input{overflow:visible}button,select{text-transform:none}button,html [type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0}button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:1px dotted ButtonText}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}textarea{overflow:auto}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px}[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-input-placeholder{color:inherit;opacity:.54}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}*{box-sizing:border-box}body,html{height:100%}body{color:#555;font-size:14px;min-width:320px;line-height:1.5;background:#f7f7f7;font-family:'Merriweather', serif}a{outline:none;color:#555;-webkit-transition:all 150ms ease-in-out;-moz-transition:all 150ms ease-in-out;-ms-transition:all 150ms ease-in-out;-o-transition:all 150ms ease-in-out;transition:all 150ms ease-in-out;text-decoration:none}a:hover{color:#888}h1{margin:0;font-size:1.25em}h2{margin:0;font-size:1.1em}h3{margin:0;font-size:1em}.c-site-wrapper{width:100%;height:100%;overflow-x:hidden;overflow-y:scroll;-webkit-overflow-scrolling:touch}.c-site-viewport{width:100%;-webkit-transform:translateX(0);-moz-transform:translateX(0);-ms-transform:translateX(0);-o-transform:translateX(0);transform:translateX(0)}@media (max-width: 1024px){.c-site-viewport{-webkit-transition:300ms;-moz-transition:300ms;-ms-transition:300ms;-o-transition:300ms;transition:300ms}}@media (max-width: 1024px){[data-menu-visible="1"] .c-site-viewport{-webkit-transform:translateX(300px);-moz-transform:translateX(300px);-ms-transform:translateX(300px);-o-transform:translateX(300px);transform:translateX(300px)}}.c-site-sidebar{width:300px;height:100%;position:absolute;top:0;z-index:1;text-align:center}@media (min-width: 1025px){.c-site-sidebar{left:0}}@media (max-width: 1024px){.c-site-sidebar{left:-300px}}.c-sidebar-header{height:100px;position:relative;margin-bottom:65px;-webkit-background-size:cover;-moz-background-size:cover;-ms-background-size:cover;-o-background-size:cover;background-size:cover;background-position:50% 50%}.c-sidebar-header__link,.c-sidebar-header__image{width:80px;height:80px;display:block}.c-sidebar-header__image{-webkit-border-radius:40px;-moz-border-radius:40px;-ms-border-radius:40px;-o-border-radius:40px;border-radius:40px;border:2px solid #fff}.c-sidebar-header__link{left:50%;bottom:-40px;z-index:1;position:absolute;margin-left:-40px}.c-sidebar-blog-description{padding:0 20px;font-size:0.9em;color:#888;margin-bottom:20px;font-weight:normal}.c-sidebar-blog-title{padding:0 15px;font-size:1.25em;margin-bottom:20px}.c-sidebar-contact-links{font-size:0.9em;margin-bottom:20px;padding:0 15px 20px;border-bottom:1px solid #eaeaea}.c-sidebar-contact-links__item{padding:0 5px}.c-sidebar-navigation{font-size:0.9em;margin-bottom:20px;padding:0 15px 20px;border-bottom:1px solid #eaeaea}.c-sidebar-navigation__item{padding:5px;font-weight:bold;display:inline-block}.c-sidebar-promotion-links{font-size:0.9em;margin-bottom:20px;padding-bottom:20px;border-bottom:1px solid #eaeaea}.c-sidebar-promotion-links__item{padding:5px 15px;display:block}.c-site-content{min-height:100vh;max-width:1000px;background:#fff;border-left:1px solid #eaeaea;border-right:1px solid #eaeaea}@media (max-width: 1024px){.c-site-content{padding:20px}}@media (min-width: 1025px){.c-site-content{padding:30px;margin-left:300px}}.c-mobile-header{margin-bottom:30px;padding-bottom:25px;border-bottom:1px solid #eaeaea}@media (min-width: 1025px){.c-mobile-header{display:none}}.c-mobile-header__link,.c-mobile-header__logo,.c-mobile-header__logo__image{height:40px;line-height:40px}.c-mobile-header__link{font-weight:bold}.c-mobile-header__logo{float:right}.c-mobile-header__logo__image{width:40px;height:40px;-webkit-border-radius:20px;-moz-border-radius:20px;-ms-border-radius:20px;-o-border-radius:20px;border-radius:20px}.c-error-message{line-height:2;text-align:center;color:#888}.c-post-list__item{margin-bottom:35px;padding-bottom:20px;border-bottom:1px solid #eaeaea}@media (min-width: 1200px){.c-post-list__item{width:31.33333%;float:left;margin-right:3%}.c-post-list__item:nth-child(3n){margin-right:0}.c-post-list__item:nth-child(3n+1){clear:left}}@media (max-width: 1199px) and (min-width: 880px){.c-post-list__item{width:48%;float:left;margin-right:4%}.c-post-list__item:nth-child(2n){margin-right:0}.c-post-list__item:nth-child(2n+1){clear:left}}.c-post-list__image{display:block;margin-bottom:15px}.c-post-list__image:hover{opacity:0.8}.c-post-list__image__img{width:100%;display:block}.c-post-list__title{font-size:1.1em;line-height:1.4;margin-bottom:10px}.c-post-list__meta{font-size:0.9em;font-style:italic;color:#888}.c-post-list__meta__tags{text-transform:lowercase}.c-post-view__footer{text-align:center;margin-top:30px;padding:30px 0 10px;border-top:1px solid #eaeaea}.c-post-view-meta{line-height:2;font-size:0.9em;font-style:italic;color:#888}.c-post-view-meta__tags{text-transform:lowercase}.c-page-title__heading+.c-post-view-meta{margin-top:10px}.c-post-view-share__item{float:left;width:100%;padding:10px;margin:1px 0;color:#fff;font-size:0.9em;font-weight:bold}@media (min-width: 550px){.c-post-view-share__item{width:33.333%}}.c-post-view-share__item:hover{opacity:0.9;color:#fff}.c-post-view-share__item--twitter{background:#4099FF}.c-post-view-share__item--facebook{background:#3B5998}.c-post-view-share__item--google{background:#d34836}.c-post-view-prev-next{margin-top:30px;padding-top:30px;border-top:1px solid #eaeaea}@media (min-width: 700px){.c-post-view-prev-next__item{width:48%;float:left;margin-right:4%}.c-post-view-prev-next__item:nth-child(2n){margin-right:0}.c-post-view-prev-next__item:nth-child(2n+1){clear:left}}@media (max-width: 701px){.c-post-view-prev-next__item:first-child{margin-bottom:35px;padding-bottom:20px;border-bottom:1px solid #eaeaea}}.c-post-view-prev-next__image{margin-bottom:15px;position:relative;display:block}.c-post-view-prev-next__image:hover{opacity:0.8}.c-post-view-prev-next__image__img{width:100%;display:block}.c-post-view-prev-next__image--placeholder{opacity:0.8;padding-top:50%;background:#eaeaea}.c-post-view-prev-next__image__label{top:10px;color:#fff;position:absolute;padding:10px 15px;background:rgba(85,85,85,0.5)}.c-post-view-prev-next__image__label--next{left:10px}.c-post-view-prev-next__image__label--previous{right:10px}.c-post-pagination__item--older{float:right}.c-page-title{text-align:center;margin-bottom:40px;padding:10px 0 35px 0;border-bottom:1px solid #eaeaea}.c-page-title__heading__tag{text-transform:lowercase}.c-author-page{text-align:center;margin-bottom:40px;padding:10px 0 40px;border-bottom:1px solid #eaeaea}.c-author-page__image{margin-bottom:20px}.c-author-page__image__src{width:100px;height:100px;display:block;margin:0 auto;-webkit-border-radius:50px;-moz-border-radius:50px;-ms-border-radius:50px;-o-border-radius:50px;border-radius:50px}.c-author-page__bio{max-width:580px;font-size:0.9em;color:#888;font-weight:normal;margin:20px auto 0}.c-author-page__meta{margin-top:20px;font-size:0.9em;color:#888}.c-disqus-comments{margin-top:30px;padding-top:30px;border-top:1px solid #eaeaea}.c-disqus-comments__button{display:block;cursor:pointer;margin-top:10px;padding:20px 25px;background:#eaeaea}.clear:after,.c-mobile-header:after,.c-post-list:after,.c-post-view-share:after,.c-post-view-prev-next:after,.c-post-pagination:after{content:"";clear:both;display:table}.markdown,.c-post-view__content{line-height:2}.markdown h1,.c-post-view__content h1,.markdown h2,.c-post-view__content h2,.markdown h3,.c-post-view__content h3,.markdown p,.c-post-view__content p,.markdown ul,.c-post-view__content ul,.markdown blockquote,.c-post-view__content blockquote,.markdown pre,.c-post-view__content pre,.markdown .gist,.c-post-view__content .gist{margin-bottom:30px;word-wrap:break-word}.markdown h1:last-child,.c-post-view__content h1:last-child,.markdown h2:last-child,.c-post-view__content h2:last-child,.markdown h3:last-child,.c-post-view__content h3:last-child,.markdown p:last-child,.c-post-view__content p:last-child,.markdown ul:last-child,.c-post-view__content ul:last-child,.markdown blockquote:last-child,.c-post-view__content blockquote:last-child,.markdown pre:last-child,.c-post-view__content pre:last-child,.markdown .gist:last-child,.c-post-view__content .gist:last-child{margin-bottom:0}.markdown ul,.c-post-view__content ul{padding-left:3em}.markdown a,.c-post-view__content a{text-decoration:underline}.markdown a:hover,.c-post-view__content a:hover{text-decoration:none}.markdown a:hover img,.c-post-view__content a:hover img{opacity:0.8}.markdown img,.c-post-view__content img{width:100%;-webkit-transition:all 150ms ease-in-out;-moz-transition:all 150ms ease-in-out;-ms-transition:all 150ms ease-in-out;-o-transition:all 150ms ease-in-out;transition:all 150ms ease-in-out}.markdown img.inline,.c-post-view__content img.inline{width:auto;display:inline-block}.markdown blockquote,.c-post-view__content blockquote{padding-left:30px;font-style:italic;border-left:4px solid #eaeaea}.markdown hr,.c-post-view__content hr{border:0;height:1px;margin:30px 0;background:#eaeaea}.markdown pre,.c-post-view__content pre{padding:1em;overflow:auto;font-size:0.9em;line-height:1.5;background:#f7f7f7}.markdown code,.c-post-view__content code{background:#f7f7f7}.markdown .gist .gist-file,.c-post-view__content .gist .gist-file{margin-bottom:0} diff --git a/package.json b/package.json index bd29151..235d302 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Willow", - "version": "3.0.0", + "version": "4.0.0", "main": "Gruntfile.js", "author": { "name": "Raivis Vitols", diff --git a/partials/comments.hbs b/partials/comments.hbs index 33f74b9..43cb771 100644 --- a/partials/comments.hbs +++ b/partials/comments.hbs @@ -1,13 +1,21 @@
- {{! Replace Code From Here }} -
+ - {{! Replace Code Until Here }}
\ No newline at end of file diff --git a/partials/post-meta.hbs b/partials/post-meta.hbs index 30b1071..d7fec42 100644 --- a/partials/post-meta.hbs +++ b/partials/post-meta.hbs @@ -9,6 +9,4 @@ {{/foreach}} {{/if}} - | - {{> "post-share"}} \ No newline at end of file diff --git a/partials/post-share.hbs b/partials/post-share.hbs index ce45d60..74b3c69 100644 --- a/partials/post-share.hbs +++ b/partials/post-share.hbs @@ -1,16 +1,14 @@ - - - | - - | - Share on Google+ - \ No newline at end of file + \ No newline at end of file diff --git a/partials/prev-next.hbs b/partials/prev-next.hbs new file mode 100644 index 0000000..727761a --- /dev/null +++ b/partials/prev-next.hbs @@ -0,0 +1,47 @@ +
+ {{#next_post}} + + {{else}} +
+
+ + No Newer Posts + +
+
+ {{/next_post}} + + {{#prev_post}} + + {{else}} +
+
+ + No Older Posts + +
+
+ {{/prev_post}} +
\ No newline at end of file diff --git a/post.hbs b/post.hbs index 776f000..7c03c35 100644 --- a/post.hbs +++ b/post.hbs @@ -14,9 +14,9 @@
- {{> "post-meta"}} + {{> "post-share"}} + {{> "prev-next"}} +
- - {{/post}} \ No newline at end of file diff --git a/source/sass/components/_author-page.scss b/source/sass/components/_author-page.scss index 8bbb176..d1b3e73 100644 --- a/source/sass/components/_author-page.scss +++ b/source/sass/components/_author-page.scss @@ -25,7 +25,7 @@ // Bio .c-author-page__bio { - max-width: 600px; + max-width: 580px; font-size: 0.9em; color: $c-grayDark; font-weight: normal; diff --git a/source/sass/components/_disqus-comments.scss b/source/sass/components/_disqus-comments.scss index 6cc1abf..a46fac4 100644 --- a/source/sass/components/_disqus-comments.scss +++ b/source/sass/components/_disqus-comments.scss @@ -8,3 +8,11 @@ padding-top: 30px; border-top: 1px solid $c-gray; } + +.c-disqus-comments__button { + display: block; + cursor: pointer; + margin-top: 10px; + padding: 20px 25px; + background: $c-gray; +} diff --git a/source/sass/components/_page-title.scss b/source/sass/components/_page-title.scss index 6d5f8f4..3cb6cc2 100644 --- a/source/sass/components/_page-title.scss +++ b/source/sass/components/_page-title.scss @@ -6,7 +6,7 @@ .c-page-title { text-align: center; margin-bottom: 40px; - padding: 10px 0 40px 0; + padding: 10px 0 35px 0; border-bottom: 1px solid $c-gray; } diff --git a/source/sass/components/_post-list.scss b/source/sass/components/_post-list.scss index 6aa8f94..3de264d 100644 --- a/source/sass/components/_post-list.scss +++ b/source/sass/components/_post-list.scss @@ -47,7 +47,7 @@ // Meta info .c-post-list__meta { - font-size: 0.8em; + font-size: 0.9em; font-style: italic; color: $c-grayDark; } diff --git a/source/sass/components/_post-view-meta.scss b/source/sass/components/_post-view-meta.scss deleted file mode 100644 index 12ec7d3..0000000 --- a/source/sass/components/_post-view-meta.scss +++ /dev/null @@ -1,19 +0,0 @@ -/* -|------------------------------------------------------------------------------- -| Post view meta - date & tags -|------------------------------------------------------------------------------- -*/ -.c-post-view-meta { - line-height: 2; - font-size: 0.8em; - font-style: italic; - color: $c-grayDark; -} - -.c-post-view-meta__tags { - text-transform: lowercase; -} - -.c-page-title__heading + .c-post-view-meta { - margin-top: 20px; -} \ No newline at end of file diff --git a/source/sass/components/_post-view-share.scss b/source/sass/components/_post-view-share.scss deleted file mode 100644 index cb61687..0000000 --- a/source/sass/components/_post-view-share.scss +++ /dev/null @@ -1,20 +0,0 @@ -/* -|------------------------------------------------------------------------------- -| Post view share - share on Twitter, Facebook and Google+ -|------------------------------------------------------------------------------- -*/ -.c-post-view-share { - font-weight: bold; -} - -.c-post-view-share__item--twitter { - color: #4099FF; -} - -.c-post-view-share__item--facebook { - color: #3B5998; -} - -.c-post-view-share__item--google { - color: #d34836; -} \ No newline at end of file diff --git a/source/sass/components/_post-view.scss b/source/sass/components/_post-view.scss index 7fab01d..ba6fd3d 100644 --- a/source/sass/components/_post-view.scss +++ b/source/sass/components/_post-view.scss @@ -11,14 +11,132 @@ // Footer .c-post-view__footer { text-align: center; - margin-top: 40px; - padding: 40px 0 10px; + margin-top: 30px; + padding: 30px 0 10px; border-top: 1px solid $c-gray; } -// Narrow post page view -.c-post-view--narrow { - text-align: center; - max-width: 610px; - margin: 0 auto; -} \ No newline at end of file +/* +|------------------------------------------------------------------------------- +| Post view meta - date & tags +|------------------------------------------------------------------------------- +*/ +.c-post-view-meta { + line-height: 2; + font-size: 0.9em; + font-style: italic; + color: $c-grayDark; +} + +.c-post-view-meta__tags { + text-transform: lowercase; +} + +.c-page-title__heading + .c-post-view-meta { + margin-top: 10px; +} + +/* +|------------------------------------------------------------------------------- +| Post view share - share on Twitter, Facebook and Google+ +|------------------------------------------------------------------------------- +*/ +.c-post-view-share { + @extend .clear; +} + +.c-post-view-share__item { + float: left; + width: 100%; + padding: 10px; + margin: 1px 0; + color: $c-white; + font-size: 0.9em; + font-weight: bold; + + @media (min-width: 550px) { + width: 33.333%; + } +} + +.c-post-view-share__item:hover { + opacity: 0.9; + color: $c-white; +} + +.c-post-view-share__item--twitter { + background: #4099FF; +} + +.c-post-view-share__item--facebook { + background: #3B5998; +} + +.c-post-view-share__item--google { + background: #d34836; +} + +/* +|------------------------------------------------------------------------------- +| Post view previous / next post +|------------------------------------------------------------------------------- +*/ +.c-post-view-prev-next { + @extend .clear; + margin-top: 30px; + padding-top: 30px; + border-top: 1px solid $c-gray; +} + +.c-post-view-prev-next__item { + @media (min-width: 700px) { + @include post2Col(); + } + + @media (max-width: 701px) { + &:first-child { + margin-bottom: 35px; + padding-bottom: 20px; + border-bottom: 1px solid $c-gray; + } + } +} + +// Image and image link +.c-post-view-prev-next__image { + margin-bottom: 15px; + position: relative; + display: block; + + &:hover { + opacity: 0.8; + } +} + +.c-post-view-prev-next__image__img { + width: 100%; + display: block; +} + +.c-post-view-prev-next__image--placeholder { + opacity: 0.8; + padding-top: 50%; + background: $c-gray; +} + +// Previous and Next labels +.c-post-view-prev-next__image__label { + top: 10px; + color: $c-white; + position: absolute; + padding: 10px 15px; + background: rgba($c-black, 0.5); +} + +.c-post-view-prev-next__image__label--next { + left: 10px; +} + +.c-post-view-prev-next__image__label--previous { + right: 10px; +} diff --git a/source/sass/components/_sidebar-blog-description.scss b/source/sass/components/_sidebar-blog-description.scss deleted file mode 100644 index a7166fc..0000000 --- a/source/sass/components/_sidebar-blog-description.scss +++ /dev/null @@ -1,12 +0,0 @@ -/* -|------------------------------------------------------------------------------- -| Sidebar blog description -|------------------------------------------------------------------------------- -*/ -.c-sidebar-blog-description { - padding: 0 20px; - font-size: 0.8em; - color: $c-grayDark; - margin-bottom: 20px; - font-weight: normal; -} \ No newline at end of file diff --git a/source/sass/components/_sidebar-blog-title.scss b/source/sass/components/_sidebar-blog-title.scss deleted file mode 100644 index a828cb7..0000000 --- a/source/sass/components/_sidebar-blog-title.scss +++ /dev/null @@ -1,10 +0,0 @@ -/* -|------------------------------------------------------------------------------- -| Sidebar blog title -|------------------------------------------------------------------------------- -*/ -.c-sidebar-blog-title { - padding: 0 15px; - font-size: 1.2em; - margin-bottom: 20px; -} \ No newline at end of file diff --git a/source/sass/components/_sidebar-contact-links.scss b/source/sass/components/_sidebar-contact-links.scss deleted file mode 100644 index 7e435b1..0000000 --- a/source/sass/components/_sidebar-contact-links.scss +++ /dev/null @@ -1,15 +0,0 @@ -/* -|------------------------------------------------------------------------------- -| Sidebar contact links - github, linkedin, twitter, etc. -|------------------------------------------------------------------------------- -*/ -.c-sidebar-contact-links { - font-size: 0.8em; - margin-bottom: 20px; - padding: 0 15px 20px; - border-bottom: 1px solid $c-gray; -} - -.c-sidebar-contact-links__item { - padding: 0 5px; -} \ No newline at end of file diff --git a/source/sass/components/_sidebar-header.scss b/source/sass/components/_sidebar-header.scss deleted file mode 100644 index 2c4320e..0000000 --- a/source/sass/components/_sidebar-header.scss +++ /dev/null @@ -1,36 +0,0 @@ -/* -|------------------------------------------------------------------------------- -| Sidebar header -|------------------------------------------------------------------------------- -*/ -// Cover -.c-sidebar-header { - height: 100px; - position: relative; - margin-bottom: 65px; - @include bg-size(cover); - background-position: 50% 50%; -} - -// Logo and link -.c-sidebar-header__link, -.c-sidebar-header__image { - width: 80px; - height: 80px; - display: block; -} - -// Logo -.c-sidebar-header__image { - @include border-radius(40px); - border: 2px solid $c-white; -} - -// Link { -.c-sidebar-header__link { - left: 50%; - bottom: -40px; - z-index: 1; - position: absolute; - margin-left: -40px; -} \ No newline at end of file diff --git a/source/sass/components/_sidebar-navigation.scss b/source/sass/components/_sidebar-navigation.scss deleted file mode 100644 index 22e8235..0000000 --- a/source/sass/components/_sidebar-navigation.scss +++ /dev/null @@ -1,17 +0,0 @@ -/* -|------------------------------------------------------------------------------- -| Sidebar navigation -|------------------------------------------------------------------------------- -*/ -.c-sidebar-navigation { - font-size: 0.9em; - margin-bottom: 20px; - padding: 0 15px 20px; - border-bottom: 1px solid $c-gray; -} - -.c-sidebar-navigation__item { - padding: 5px; - font-weight: bold; - display: inline-block; -} \ No newline at end of file diff --git a/source/sass/components/_sidebar-promotion-links.scss b/source/sass/components/_sidebar-promotion-links.scss deleted file mode 100644 index 7fa8416..0000000 --- a/source/sass/components/_sidebar-promotion-links.scss +++ /dev/null @@ -1,16 +0,0 @@ -/* -|------------------------------------------------------------------------------- -| Sidebar promotion links -|------------------------------------------------------------------------------- -*/ -.c-sidebar-promotion-links { - font-size: 0.8em; - margin-bottom: 20px; - padding-bottom: 20px; - border-bottom: 1px solid $c-gray; -} - -.c-sidebar-promotion-links__item { - padding: 5px 15px; - display: block; -} \ No newline at end of file diff --git a/source/sass/components/_site-sidebar.scss b/source/sass/components/_site-sidebar.scss index f552b93..cb72bfb 100644 --- a/source/sass/components/_site-sidebar.scss +++ b/source/sass/components/_site-sidebar.scss @@ -20,4 +20,116 @@ @include breakpoint(mobile) { left: -$sidebarWidth; } +} + +/* +|------------------------------------------------------------------------------- +| Sidebar header +|------------------------------------------------------------------------------- +*/ +// Cover +.c-sidebar-header { + height: 100px; + position: relative; + margin-bottom: 65px; + @include bg-size(cover); + background-position: 50% 50%; +} + +// Logo and link +.c-sidebar-header__link, +.c-sidebar-header__image { + width: 80px; + height: 80px; + display: block; +} + +// Logo +.c-sidebar-header__image { + @include border-radius(40px); + border: 2px solid $c-white; +} + +// Link { +.c-sidebar-header__link { + left: 50%; + bottom: -40px; + z-index: 1; + position: absolute; + margin-left: -40px; +} + +/* +|------------------------------------------------------------------------------- +| Sidebar blog description +|------------------------------------------------------------------------------- +*/ +.c-sidebar-blog-description { + padding: 0 20px; + font-size: 0.9em; + color: $c-grayDark; + margin-bottom: 20px; + font-weight: normal; +} + +/* +|------------------------------------------------------------------------------- +| Sidebar blog title +|------------------------------------------------------------------------------- +*/ +.c-sidebar-blog-title { + padding: 0 15px; + font-size: 1.25em; + margin-bottom: 20px; +} + +/* +|------------------------------------------------------------------------------- +| Sidebar contact links - github, linkedin, twitter, etc. +|------------------------------------------------------------------------------- +*/ +.c-sidebar-contact-links { + font-size: 0.9em; + margin-bottom: 20px; + padding: 0 15px 20px; + border-bottom: 1px solid $c-gray; +} + +.c-sidebar-contact-links__item { + padding: 0 5px; +} + +/* +|------------------------------------------------------------------------------- +| Sidebar navigation +|------------------------------------------------------------------------------- +*/ +.c-sidebar-navigation { + font-size: 0.9em; + margin-bottom: 20px; + padding: 0 15px 20px; + border-bottom: 1px solid $c-gray; +} + +.c-sidebar-navigation__item { + padding: 5px; + font-weight: bold; + display: inline-block; +} + +/* +|------------------------------------------------------------------------------- +| Sidebar promotion links +|------------------------------------------------------------------------------- +*/ +.c-sidebar-promotion-links { + font-size: 0.9em; + margin-bottom: 20px; + padding-bottom: 20px; + border-bottom: 1px solid $c-gray; +} + +.c-sidebar-promotion-links__item { + padding: 5px 15px; + display: block; } \ No newline at end of file diff --git a/source/sass/elements/_elements.scss b/source/sass/elements/_elements.scss index 95dbe27..464d7b9 100644 --- a/source/sass/elements/_elements.scss +++ b/source/sass/elements/_elements.scss @@ -16,7 +16,7 @@ body, html { // Body body { color: $c-black; - font-size: 16px; + font-size: 14px; min-width: 320px; line-height: 1.5; background: $c-background; @@ -38,12 +38,12 @@ a { // Headings h1 { margin: 0; - font-size: 1.4em; + font-size: 1.25em; } h2 { margin: 0; - font-size: 1.2em; + font-size: 1.1em; } h3 { diff --git a/source/sass/styles.scss b/source/sass/styles.scss index c0a9343..872b4c7 100644 --- a/source/sass/styles.scss +++ b/source/sass/styles.scss @@ -46,17 +46,8 @@ $maxPageWidth: 1000px; @import "components/mobile-header"; @import "components/error-message"; -@import "components/sidebar-header"; -@import "components/sidebar-blog-title"; -@import "components/sidebar-blog-description"; -@import "components/sidebar-contact-links"; -@import "components/sidebar-navigation"; -@import "components/sidebar-promotion-links"; - @import "components/post-list"; @import "components/post-view"; -@import "components/post-view-meta"; -@import "components/post-view-share"; @import "components/post-pagination"; @import "components/page-title"; diff --git a/source/sass/tools/_mixins.scss b/source/sass/tools/_mixins.scss index 7db16e6..f22b9e8 100644 --- a/source/sass/tools/_mixins.scss +++ b/source/sass/tools/_mixins.scss @@ -6,13 +6,13 @@ // Shortcuts to breakpoints @mixin breakpoint($breakpoint) { @if $breakpoint == "mobile" { - @media (max-width: 640px) { + @media (max-width: 1024px) { @content; } } @else if $breakpoint == "desktop" { - @media (min-width: 641px) { + @media (min-width: 1025px) { @content; } } -- 2.34.1