Updated theme to use blog data from admin

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..0d31019
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.sass-cache/

diff --git a/assets/css/styles.css b/assets/css/styles.css
index 46714b4d6877f21b18af3ace71a8c9b44f6cc5aa..dd06b1d1cea1c5b830b64cc1bb3e929e84101e29 100644 (file)
--- a/assets/css/styles.css
+++ b/assets/css/styles.css
@@ -1 +1 @@
-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,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}.clear:after,.content .pagination:after{content:"";clear:both;display:table}.markdown,.content .post-content{line-height:2em}.markdown h1,.content .post-content h1,.markdown h2,.content .post-content h2,.markdown h3,.content .post-content h3,.markdown p,.content .post-content p,.markdown ul,.content .post-content ul,.markdown blockquote,.content .post-content blockquote,.markdown pre,.content .post-content pre,.markdown .gist,.content .post-content .gist{margin-bottom:30px}.markdown h1:last-child,.content .post-content h1:last-child,.markdown h2:last-child,.content .post-content h2:last-child,.markdown h3:last-child,.content .post-content h3:last-child,.markdown p:last-child,.content .post-content p:last-child,.markdown ul:last-child,.content .post-content ul:last-child,.markdown blockquote:last-child,.content .post-content blockquote:last-child,.markdown pre:last-child,.content .post-content pre:last-child,.markdown .gist:last-child,.content .post-content .gist:last-child{margin-bottom:0}.markdown h1,.content .post-content h1{font-size:1.4em}.markdown h2,.content .post-content h2{font-size:1.2em}.markdown h3,.content .post-content h3{font-size:1em}.markdown ul,.content .post-content ul{padding-left:3em}.markdown a,.content .post-content a{text-decoration:underline}.markdown a:hover,.content .post-content a:hover{text-decoration:none}.markdown a:hover img,.content .post-content a:hover img{opacity:0.8}.markdown img,.content .post-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 blockquote,.content .post-content blockquote{padding-left:30px;font-style:italic;border-left:4px solid #f7f7f7}.markdown hr,.content .post-content hr{border:0;height:1px;margin:30px 0;background:#f7f7f7}.markdown pre,.content .post-content pre{padding:1em;font-size:0.9em;line-height:1.5em;background:#f7f7f7}.markdown code,.content .post-content code{background:#f7f7f7}.markdown .gist .gist-file,.content .post-content .gist .gist-file{margin-bottom:0}*{box-sizing:border-box}h1,h2,h3,p,ul,blockquote,pre{margin:0;padding:0}html,body{height:100%}html,body{min-width:320px;background:#f7f7f7;font-size:16px;line-height:1.2em;color:#555;font-family:'Merriweather', serif}a{outline:none;color:#555;text-decoration:none;-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}a:hover{color:#888}.wrapper{width:100%;height:100%;overflow-x:hidden}.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){.viewport{-webkit-transition:300ms;-moz-transition:300ms;-ms-transition:300ms;-o-transition:300ms;transition:300ms}}@media (max-width: 640px){.wrapper[data-menu-visible="1"] .viewport{-webkit-transform:translateX(290px);-moz-transform:translateX(290px);-ms-transform:translateX(290px);-o-transform:translateX(290px);transform:translateX(290px)}}.sidebar{width:290px;position:absolute;height:100%;z-index:1;top:0}@media (min-width: 641px){.sidebar{left:0}}@media (max-width: 640px){.sidebar{left:-290px}}.content{min-height:100vh;max-width:1000px}@media (min-width: 641px){.content{margin-left:290px}}.sidebar{text-align:center}.sidebar .sidebar-header{background-position:50% 50%;background-size:cover;margin-bottom:70px;position:relative;height:100px}.sidebar .sidebar-header a,.sidebar .sidebar-header img{width:80px;height:80px}.sidebar .sidebar-header a{left:50%;bottom:-40px;position:absolute;margin-left:-40px}.sidebar .sidebar-header img{display:block;border:2px solid #fff;-webkit-border-radius:40px;-moz-border-radius:40px;-ms-border-radius:40px;-o-border-radius:40px;border-radius:40px}.sidebar h1,.sidebar h2,.sidebar .sidebar-menu,.sidebar .sidebar-links{margin:0 auto 20px;max-width:265px}.sidebar h1{font-size:1.2em}.sidebar h2{font-size:0.8em;color:#888;font-weight:normal}.sidebar .sidebar-links{font-size:0.8em;padding-bottom:20px;border-bottom:1px solid #eaeaea}.sidebar .sidebar-links a{padding:0 5px}.sidebar .sidebar-menu a{display:block;padding:5px 0;font-size:0.9em;font-weight:bold}.mobile-header{margin-bottom:20px}.mobile-header .mobile-menu,.mobile-header .mobile-logo{height:40px;cursor:pointer;display:inline-block}.mobile-header .mobile-menu{font-weight:bold;line-height:40px}.mobile-header .mobile-logo{width:40px;float:right}.mobile-header .mobile-logo img{max-width:100%}@media (min-width: 641px){.mobile-header{display:none}}.error-page{text-align:center;color:#888;line-height:2em}.content{background:#fff;border-left:1px solid #eaeaea}@media (max-width: 640px){.content{padding:20px}}@media (min-width: 641px){.content{padding:30px;border-right:1px solid #eaeaea}}.content .post-listed{margin-bottom:35px;padding-bottom:20px;border-bottom:1px solid #eaeaea}.content .post-listed h2{font-size:1.1em;line-height:1.4em;margin-bottom:10px}@media (min-width: 1200px){.content .post-listed{width:31.33333%;float:left;margin-right:3%}.content .post-listed:nth-child(3n){margin-right:0}.content .post-listed:nth-child(3n+1){clear:left}}@media (max-width: 640px) and (min-width: 600px){.content .post-listed{width:48%;float:left;margin-right:4%}.content .post-listed:nth-child(2n){margin-right:0}.content .post-listed:nth-child(2n+1){clear:left}}@media (max-width: 1199px) and (min-width: 880px){.content .post-listed{width:48%;float:left;margin-right:4%}.content .post-listed:nth-child(2n){margin-right:0}.content .post-listed:nth-child(2n+1){clear:left}}.content .post-single .post-header,.content .post-single .post-footer{margin:50px 0 40px;padding:40px 0;text-align:center;border-top:1px solid #f7f7f7;border-bottom:1px solid #f7f7f7}.content .post-single .post-header h1,.content .post-single .post-footer h1{font-size:1.4em;line-height:normal;margin-bottom:20px}.content .post-single .post-header{margin-top:0}.content .post-image{display:block;margin-bottom:15px}.content .post-image:not(div):hover{opacity:0.8}.content .post-image img{width:100%;display:block}.content .post-meta{font-size:0.8em;font-style:italic;color:#888}.content .post-meta .tags a{text-transform:lowercase}.content .post-meta .share a{font-weight:bold;padding:0 5px 0 0}.content .post-meta .share .share-twitter{color:#4099FF}.content .post-meta .share .share-facebook{color:#3B5998}.content .post-meta .share .share-google-plus{color:#d34836}.content .post-meta .share .share-twitter:hover,.content .post-meta .share .share-facebook:hover,.content .post-meta .share .share-google-plus:hover{color:#888}.content .pagination{clear:both}.content .pagination .older-posts{float:right}
+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,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}.clear:after,.content .pagination:after{content:"";clear:both;display:table}.markdown,.content .post-content{line-height:2em}.markdown h1,.content .post-content h1,.markdown h2,.content .post-content h2,.markdown h3,.content .post-content h3,.markdown p,.content .post-content p,.markdown ul,.content .post-content ul,.markdown blockquote,.content .post-content blockquote,.markdown pre,.content .post-content pre,.markdown .gist,.content .post-content .gist{margin-bottom:30px}.markdown h1:last-child,.content .post-content h1:last-child,.markdown h2:last-child,.content .post-content h2:last-child,.markdown h3:last-child,.content .post-content h3:last-child,.markdown p:last-child,.content .post-content p:last-child,.markdown ul:last-child,.content .post-content ul:last-child,.markdown blockquote:last-child,.content .post-content blockquote:last-child,.markdown pre:last-child,.content .post-content pre:last-child,.markdown .gist:last-child,.content .post-content .gist:last-child{margin-bottom:0}.markdown h1,.content .post-content h1{font-size:1.4em}.markdown h2,.content .post-content h2{font-size:1.2em}.markdown h3,.content .post-content h3{font-size:1em}.markdown ul,.content .post-content ul{padding-left:3em}.markdown a,.content .post-content a{text-decoration:underline}.markdown a:hover,.content .post-content a:hover{text-decoration:none}.markdown a:hover img,.content .post-content a:hover img{opacity:0.8}.markdown img,.content .post-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 blockquote,.content .post-content blockquote{padding-left:30px;font-style:italic;border-left:4px solid #f7f7f7}.markdown hr,.content .post-content hr{border:0;height:1px;margin:30px 0;background:#f7f7f7}.markdown pre,.content .post-content pre{padding:1em;font-size:0.9em;line-height:1.5em;background:#f7f7f7}.markdown code,.content .post-content code{background:#f7f7f7}.markdown .gist .gist-file,.content .post-content .gist .gist-file{margin-bottom:0}*{box-sizing:border-box}h1,h2,h3,p,ul,blockquote,pre{margin:0;padding:0}html,body{height:100%}html,body{min-width:320px;background:#f7f7f7;font-size:16px;line-height:1.2em;color:#555;font-family:'Merriweather', serif}a{outline:none;color:#555;text-decoration:none;-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}a:hover{color:#888}.wrapper{width:100%;height:100%;overflow-x:hidden}.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){.viewport{-webkit-transition:300ms;-moz-transition:300ms;-ms-transition:300ms;-o-transition:300ms;transition:300ms}}@media (max-width: 640px){.wrapper[data-menu-visible="1"] .viewport{-webkit-transform:translateX(290px);-moz-transform:translateX(290px);-ms-transform:translateX(290px);-o-transform:translateX(290px);transform:translateX(290px)}}.sidebar{width:290px;position:absolute;height:100%;z-index:1;top:0}@media (min-width: 641px){.sidebar{left:0}}@media (max-width: 640px){.sidebar{left:-290px}}.content{min-height:100vh;max-width:1000px}@media (min-width: 641px){.content{margin-left:290px}}.sidebar{text-align:center}.sidebar .sidebar-header{background-position:50% 50%;background-size:cover;margin-bottom:70px;position:relative;height:100px}.sidebar .sidebar-header a,.sidebar .sidebar-header img{width:80px;height:80px}.sidebar .sidebar-header a{left:50%;bottom:-40px;position:absolute;margin-left:-40px}.sidebar .sidebar-header img{display:block;border:2px solid #fff;-webkit-border-radius:40px;-moz-border-radius:40px;-ms-border-radius:40px;-o-border-radius:40px;border-radius:40px}.sidebar h1,.sidebar h2,.sidebar .sidebar-menu,.sidebar .sidebar-links{margin:0 auto 20px;max-width:265px}.sidebar h1{font-size:1.2em}.sidebar h2{font-size:0.8em;color:#888;font-weight:normal}.sidebar .sidebar-links{font-size:0.8em;padding-bottom:20px;border-bottom:1px solid #eaeaea}.sidebar .sidebar-links a{padding:0 5px}.sidebar .sidebar-menu a{display:block;padding:5px 0;font-size:0.9em;font-weight:bold}.mobile-header{margin-bottom:20px}.mobile-header .mobile-menu,.mobile-header .mobile-logo{height:40px;cursor:pointer;display:inline-block}.mobile-header .mobile-menu{font-weight:bold;line-height:40px}.mobile-header .mobile-logo{width:40px;float:right}.mobile-header .mobile-logo img{max-width:100%;-webkit-border-radius:20px;-moz-border-radius:20px;-ms-border-radius:20px;-o-border-radius:20px;border-radius:20px}@media (min-width: 641px){.mobile-header{display:none}}.error-page{text-align:center;color:#888;line-height:2em}.content{background:#fff;border-left:1px solid #eaeaea}@media (max-width: 640px){.content{padding:20px}}@media (min-width: 641px){.content{padding:30px;border-right:1px solid #eaeaea}}.content .post-listed{margin-bottom:35px;padding-bottom:20px;border-bottom:1px solid #eaeaea}.content .post-listed h2{font-size:1.1em;line-height:1.4em;margin-bottom:10px}@media (min-width: 1200px){.content .post-listed{width:31.33333%;float:left;margin-right:3%}.content .post-listed:nth-child(3n){margin-right:0}.content .post-listed:nth-child(3n+1){clear:left}}@media (max-width: 640px) and (min-width: 600px){.content .post-listed{width:48%;float:left;margin-right:4%}.content .post-listed:nth-child(2n){margin-right:0}.content .post-listed:nth-child(2n+1){clear:left}}@media (max-width: 1199px) and (min-width: 880px){.content .post-listed{width:48%;float:left;margin-right:4%}.content .post-listed:nth-child(2n){margin-right:0}.content .post-listed:nth-child(2n+1){clear:left}}.content .post-single .post-header,.content .post-single .post-footer{margin:50px 0 40px;padding:40px 0;text-align:center;border-top:1px solid #f7f7f7;border-bottom:1px solid #f7f7f7}.content .post-single .post-header h1,.content .post-single .post-footer h1{font-size:1.4em;line-height:normal;margin-bottom:20px}.content .post-single .post-header{margin-top:0}.content .post-image{display:block;margin-bottom:15px}.content .post-image:not(div):hover{opacity:0.8}.content .post-image img{width:100%;display:block}.content .post-meta{font-size:0.8em;font-style:italic;color:#888}.content .post-meta .tags a{text-transform:lowercase}.content .post-meta .share a{font-weight:bold;padding:0 5px 0 0}.content .post-meta .share .share-twitter{color:#4099FF}.content .post-meta .share .share-facebook{color:#3B5998}.content .post-meta .share .share-google-plus{color:#d34836}.content .post-meta .share .share-twitter:hover,.content .post-meta .share .share-facebook:hover,.content .post-meta .share .share-google-plus:hover{color:#888}.content .pagination{clear:both}.content .pagination .older-posts{float:right}

diff --git a/assets/img/avatar.jpg b/assets/img/avatar.jpg
deleted file mode 100644 (file)
index ec14492..0000000
Binary files a/assets/img/avatar.jpg and /dev/null differ

diff --git a/assets/scss/styles.scss b/assets/scss/styles.scss
index 55b16e4661f172ddeb453e32cbb9369a6c12228d..f784ca99e87ee43b6a593fd6d93c049f54d59eb7 100644 (file)
--- a/assets/scss/styles.scss
+++ b/assets/scss/styles.scss
@@ -211,6 +211,7 @@ a {
 
     img {
       max-width: 100%;
+      @include border-radius(20px);
     }
   }
 

diff --git a/default.hbs b/default.hbs
index 4d3e6601f146b4185fb6ac91ea8ef9a3870354e7..05fd1c6b34b55cac3d5bc7c24103aca0ca5db6d4 100644 (file)
--- a/default.hbs
+++ b/default.hbs
@@ -9,20 +9,19 @@
         <div id="viewport" class="viewport">
             <div id="sidebar" class="sidebar">
                 <div class="sidebar-header" style="background-image: url({{@blog.cover}})">
-                    <a href="{{@blog.url}}" title="John Doe">
-                        <img src="{{asset "img/avatar.jpg"}}" alt="John Doe">
+                    <a href="{{@blog.url}}" title="{{@blog.title}}">
+                        <img src="{{@blog.logo}}" alt="{{@blog.title}}">
                     </a>
                 </div>
 
                 <h1>
-                    <a href="{{@blog.url}}" title="John Doe">
-                        John Doe
+                    <a href="{{@blog.url}}" title="{{@blog.title}}">
+                        {{@blog.title}}
                     </a>
                 </h1>
 
                 <h2>
-                    Sed ut perspiciatis unde omnis iste natus error sit
-                    voluptatem accusantium doloremque laudantium, totam.
+                    {{@blog.description}}
                 </h2>
 
                 {{> "social-links"}}

diff --git a/partials/mobile-header.hbs b/partials/mobile-header.hbs
index 9375375631225f04b82b3db9102637b7ef44e0c1..6e4a7edb26581b4f14d861cd1717cb41e3678fcb 100644 (file)
--- a/partials/mobile-header.hbs
+++ b/partials/mobile-header.hbs
@@ -3,7 +3,7 @@
         Menu
     </a>
 
-    <a class="mobile-logo" href="{{@blog.url}}" title="John Doe">
-        <img src="{{@blog.logo}}" alt="John Doe">
+    <a class="mobile-logo" href="{{@blog.url}}" title="{{@blog.title}}">
+        <img src="{{@blog.logo}}" alt="{{@blog.title}}">
     </a>
 </div>
\ No newline at end of file