Merge remote-tracking branch 'origin/develop' into develop

Author: HyunSeob

README.md

@@ -67,13 +67,29 @@ $ hexo server
 
 See the [_config.yml.example](https://github.com/HyunSeob/hexo-theme-overdose/blob/master/_config.yml.example) file.
 
-## Disqus
+### Disqus
 
 ``` yml
 # _config.yml of base, not theme config
 # Please put your shortname of disqus here.
 disqus_shortname:
 ```
+### LiveRe
+
+LiveRe is social media comment platcform suitable for Korean SNS, like disqus. <br>
+see [LiveRe](https://livere.com/). <br>
+You can get your uid from livere setting code as below.
+
+``` html
+<div id="lv-container" data-id="city" data-uid="your uid code">
+```
+how to set
+
+``` yml
+# Please put your uid of live here.
+liveRe:
+  uid:
+```
 
 ### Post Front matter
 

_config.yml.example

@@ -74,3 +74,7 @@ facebook:
 fb_admin:
 twitter:
 google_plus:
+
+#liveRe
+liveRe:
+  uid:

layout/includes/article.jade

@@ -50,6 +50,19 @@ article#article.article(itemscope itemtype="https://schema.org/BlogPosting")
     meta(itemprop="name" content="#{config.author}")
 
   include sharer
+
+  if theme.liveRe.uid
+    #lv-container(data-id="city", data-uid="#{theme.liveRe.uid}")
+    script.
+      (function(d, s) {
+         var j, e = d.getElementsByTagName(s)[0];
+         if (typeof LivereTower === 'function') { return; }
+         j = d.createElement(s);
+         j.src = 'https://cdn-city.livere.com/js/embed.dist.js';
+         j.async = true;
+         e.parentNode.insertBefore(j, e);
+      })(document, 'script');
+
 
   // Disqus Code
   if config.disqus_shortname

layout/includes/head.jade

@@ -13,13 +13,14 @@
     fb_app_id: theme.facebook,
     fb_admins: theme.fb_admin,
     twitter_id: theme.twitter,
-    google_plus: theme.google_plus
+    google_plus: theme.google_plus,
+    url: config.url.replace(/($|\/$)/, "/") + page.canonical_path.replace('index.html', '')
   });
 - var highlight = (theme.highlight && (typeof theme.highlight === 'string')) ? theme.highlight : 'dracula';
 
 meta(charset='UTF-8')
 meta(http-equiv="X-UA-Compatible" content="IE=edge")
-meta(name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1")
+meta(name="viewport" content="width=device-width, initial-scale=1")
 
 title= pageTitle
 
@@ -42,7 +43,7 @@ if is_post()
 if theme.favicon
   link(rel="icon" href=theme.favicon)
 if theme.profile.social.rss
-  link(rel="alternative" href=theme.profile.social.rss type="application/atom+xml" title=config.title)
+  link(rel="alternate" href=theme.profile.social.rss type="application/atom+xml" title=config.title)
 
 if theme.google_site_verification
   meta(name="google-site-verification" content="#{theme.google_site_verification}")

layout/includes/layout.jade

@@ -5,12 +5,13 @@ html(lang=config.language)
   body(itemscope itemtype="https://schema.org/WebPage")
     include menu
     .page-background
-    .content-outer
-      .content-inner(itemscope itemtype="https://schema.org/Blog")
-        if body
-          div!= body
-        else
-          block content
+    .content-container
+      .content-outer
+        .content-inner(itemscope itemtype="https://schema.org/Blog")
+          if body
+            div!= body
+          else
+            block content
     include footer
 
     if theme.dynamic_menu

package.json

@@ -4,7 +4,10 @@
   "description": "The theme which you must be overdosed.",
   "private": true,
   "scripts": {
-    "build": "uglifyjs ./source/js/dynamicMenu.js -m -o ./source/js/dynamicMenu.min.js;uglifyjs ./source/js/sharer.js -m -o ./source/js/sharer.min.js;cat ./source/js/dynamicMenu.min.js ./source/js/sharer.min.js > ./source/js/index.min.js",
+	  "build-dynamicMenu": "node_modules/.bin/uglifyjs ./source/js/dynamicMenu.js -m -o ./source/js/dynamicMenu.min.js",
+    "build-share": "node_modules/.bin/uglifyjs ./source/js/sharer.js -m -o ./source/js/sharer.min.js",
+    "build-index" : "cat ./source/js/dynamicMenu.min.js ./source/js/sharer.min.js > ./source/js/index.min.js",
+    "build" : "npm run build-dynamicMenu && npm run build-share && npm run build-index",
     "cssbuild": "postcss \"src/css/index.css\" --output \"source/css/index.css\""
   },
   "devDependencies": {

source/css/layout.scss

@@ -0,0 +1,32 @@
+@import "bourbon";
+@import "variables";
+@import "custom-mixin";
+
+.page-background {
+  z-index: -1;
+  background-color: $white;
+  @include position(fixed, 0 0 0 0);
+}
+
+.content-container{
+  display:table-row;
+  width:100%;
+}
+
+.content-outer {
+  margin-top: $menu-height * 2;
+  @media #{$desktop} {
+    margin-top: $menu-height;
+  }
+}
+
+.content-inner {
+  width: 100%;
+  padding: $base-margin 0;
+}
+
+#footer{
+  display:table-row;
+  width:100%;
+  height:1px;
+}

src/css/footer.css

@@ -3,6 +3,6 @@
 .copyright {
   background-color: var(--lighted-gray);
   text-align: center;
-  padding: 2rem 0;
+  padding: 2rem 0 5rem;
   margin: 0;
 }

src/css/menu.css

@@ -6,6 +6,7 @@
 }
 
 .menu {
+  display:table-row;
   width: 100%;
   background-color: var(--white);
   border-bottom: 1px solid var(--lighted-gray);

src/css/overdose.css

@@ -2,17 +2,22 @@
 
 /* Global common styles */
 html {
+  height: 100%;
   font-size: 14px;
   @media (--desktop) {
     font-size: var(--em-base);
   }
 }
 
 body {
+  display: table;
+  width: 100%;
+  height: 100%;
   margin: 0;
   color: var(--black);
   line-height: 1.5em;
   -webkit-font-smoothing: antialiased;
+  table-layout: fixed;
 }
 
 a {