merge

themes/yilia/layout/_partial/article.ejs

@@ -105,6 +105,6 @@
   </section>
   <% }
   if(theme.gitalk.enable || theme.valine.enable){ %>
-  <div id="comments" style="margin:0 30px; background-color:#fff; padding:0 10px"></div> 
+  <div id="comments"></div> 
   <% } %>
 <% } %>

themes/yilia/layout/_partial/script.ejs

@@ -1,4 +1,4 @@
 <%- js('js/main.47daecb9041cfca058ea.js') %>
 <%- js('js/slider.ef2aa12e396cdf8555f9.js') %>
 <%- js('js/mobile.97141e5b049f95a96735.js') %>
-<%- js('js/comment.62251492e636f41e00f2.js') %>
+<%- js('js/comment.8959a0e1c58f06787797.js') %>

themes/yilia/source-src/css/article-main.scss

@@ -75,7 +75,10 @@
     max-width: 100%;
   }
 }
-
+#comments {
+  margin:0 30px;
+  background-color:#fff;
+}
 .article-inner h1.article-title, .article-title {
   color: #696969;
   margin-left: 0px;

themes/yilia/source-src/css/article.scss

@@ -1,330 +0,0 @@
-.body-wrap{
-  margin-bottom: 80px;
-}
-.article {
-  margin: 30px;
-  position: relative;
-  background: #fff;
-  -webkit-transition: all 0.2s ease-in;
-  &.show{
-    visibility: visible;
-    -webkit-animation: cd-bounce-1 0.6s;
-    -moz-animation: cd-bounce-1 0.6s;
-    animation: cd-bounce-1 0.6s;
-  }
-  &.hidden{
-    visibility: hidden;
-  }
-  img{
-    max-width: 100%;
-  }
-}
-@-webkit-keyframes cd-bounce-1 {
-  0% {
-    opacity: 0;
-    -webkit-transform: scale(1);
-  }
-  60% {
-    opacity: 1;
-    -webkit-transform: scale(1.01);
-  }
-  100% {
-    -webkit-transform: scale(1);
-  }
-}
-@-moz-keyframes cd-bounce-1 {
-  0% {
-    opacity: 0;
-    -moz-transform: scale(1);
-  }
-  60% {
-    opacity: 1;
-    -moz-transform: scale(1.01);
-  }
-  100% {
-    -moz-transform: scale(1);
-  }
-}
-@keyframes cd-bounce-1 {
-  0% {
-    opacity: 0;
-    -webkit-transform: scale(1);
-    -moz-transform: scale(1);
-    -ms-transform: scale(1);
-    -o-transform: scale(1);
-    transform: scale(1);
-  }
-  60% {
-    opacity: 1;
-    -webkit-transform: scale(1.01);
-    -moz-transform: scale(1.01);
-    -ms-transform: scale(1.01);
-    -o-transform: scale(1.01);
-    transform: scale(1.01);
-  }
-  100% {
-    -webkit-transform: scale(1);
-    -moz-transform: scale(1);
-    -ms-transform: scale(1);
-    -o-transform: scale(1);
-    transform: scale(1);
-  }
-}
-.article-index{
-  margin-left: 200px;
-  padding: 15px 0;
-  margin-right: 75px;
-  .brief{
-    display: block;
-    color: #a8a8a8;
-    font-size: 12px;
-    line-height: 14px;
-    height: 7px;
-    padding-left: 2px;
-    &:before{
-      display: inline-block;
-      content: "“";
-      font-family: serif;
-      font-size: 30px;
-      float: left;
-      margin: 4px 4px 0 -12px;
-      color: #c8c8c8;
-    }
-  }
-}
-
-.article-title {
-  color: #696969;
-  margin-left: 0px;
-  font-weight: 300;
-  line-height: 35px;
-  margin-bottom: 20px;
-  font-size: 26px;
-  -webkit-transition: color 0.3s;
-  -moz-transition: color 0.3s;
-  -o-transition: color 0.3s;
-  transition: color 0.3s;
-  &:hover{
-    color: #B0A0AA;
-  }
-}
-
-.article-inner{
-  position: relative;
-  margin-bottom: 20px;
-}
-.article-header{
-  border-left: 5px solid #4d4d4d;
-  padding: 15px 0px 15px 25px;
-}
-
-.article-info.info-on-right{
-  margin: 10px 0 0 0;
-  float: right;
-}
-.article-info-index.article-info{
-  padding-top: 20px;
-  margin: 30px 30px 0 30px;
-  border-top: 1px solid #ddd;
-}
-.article-info-post.article-info{
-  padding: 0;
-  border: none;
-  margin: -30px 0 20px 30px;
-}
-.article-entry{
-  line-height: 1.8em;
-  padding-right: 30px;
-  padding-left: 30px;
-  p{
-    margin-top: 10px;
-  }
-  p code,li code{
-    padding: 1px 3px;
-    margin: 0 3px;
-    background: #ddd;
-    border: 1px solid #ccc;
-    font-family: Menlo,Monaco,"Andale Mono","lucida console","Courier New",monospace;
-    word-wrap: break-word;
-    font-size: 14px;
-  }
-  blockquote {
-    background: #ddd;
-    border-left: 5px solid #ccc;
-    padding: 15px 20px;
-    margin-top: 10px;
-    border-left: 5px solid #657b83;
-    background: #f6f6f6;
-    p{
-      margin-top: 0;
-    }
-  }
-  em {
-    font-style: italic;
-  }
-  ul{
-    li:before{
-      content: "";
-      width: 6px;
-      height: 6px;
-      border: 1px solid #999;
-      border-radius: 10px;
-      background: #aaa;
-      display: inline-block;
-      margin-right: 10px;
-      float: left;
-      margin-top: 12px;
-    }
-  }
-  ul,ol{
-    font-size: 14px;
-    margin: 10px 0px;  
-  }
-  li{
-    ul,ol{
-      margin-left: 30px;
-      li:before{
-        content: "";
-        background: #dedede;
-      }
-    }
-  }
-  h1{
-    margin-top: 30px;
-  }
-  h2{
-    margin-top: 20px;
-    font-weight: 300;
-    color: #574C4C;
-    padding-bottom: 5px;
-    border-bottom: 1px solid #ddd;
-  }
-  h3,h4,h5,h6{
-    margin-top: 20px;
-    font-weight: 300;
-    color: #574C4C;
-    padding-bottom: 5px;
-    border-bottom: 1px solid #ddd;
-  }
-  video{
-    max-width: 100%;
-  }
-  strong {
-    font-weight: bold;
-  }
-  .caption{
-    display: block;
-    font-size: 0.8em;
-    color: #aaa;
-  }
-  hr{
-    height: 0;
-    margin-top: 20px;
-    margin-bottom: 20px;
-    border-left: 0;
-    border-right: 0;
-    border-top: 1px solid #DDD;
-    border-bottom: 1px solid #FFF;
-  }
-  pre {
-    font-size: 1 / 0.9em;
-    line-height: 1.5;
-    margin-top: 10px;
-    padding: 5px 15px;
-    overflow-x: auto;
-    color: #657b83;
-    font-size: 10px;
-    border: 1px solid #ccc;
-    text-shadow: 0 1px #444;
-    font-family: Menlo,Monaco,"Andale Mono","lucida console","Courier New",monospace;
-    code{
-      font-size: 14px;
-    }
-  }
-  table{
-    width:100%;
-    border: 1px solid #dedede;
-    margin: 15px 0;
-    border-collapse:collapse;
-    tr,td{
-      height:35px;
-    }
-    thead{
-      tr {
-        background: #f8f8f8;
-      }
-    }
-    tbody{
-      tr:hover{
-        background: #efefef;
-      }
-    }
-    td,th{
-      border: 1px solid #dedede;
-      padding: 0 10px;
-    }
-  }
-  figure{
-    table {
-      border: none;
-      width: auto;
-      margin: 0;
-      tbody{
-        tr:hover{
-          background: none;
-        }
-      }
-    }
-  }
-}
-
-.article-meta{
-  width: 150px;
-  font-size: 14;
-  text-align: right;
-  position: absolute;
-  right: 0;
-  top: 23px;
-  text-align: center;
-  z-index: 1;
-  time{
-    color: #aaa;
-  }
-}
-
-#article-nav{
-  margin: 80px 0 30px 0;
-  padding-bottom: 10px;
-  .article-nav-link-wrap{
-    margin: 0px 30px 0px 30px;
-    font-size: 14px;
-    color: #333;
-    .article-nav-title{
-      display: inline-block;
-      font-size: 12px;
-      color: #aaa;
-      transition: color 0.3s;
-    }
-    strong{
-      background: #ddd;
-      color: #fff;
-      border-radius: 100%;
-      width: 15px;
-      height: 15px;
-      display: inline-block;
-      text-align: center;
-      transition: background 0.3s;
-    }
-    &:hover{
-      strong{
-        background: #4d4d4d;
-      }
-      .article-nav-title{
-        color: #4d4d4d;
-      }
-    }
-  }
-  #article-nav-older{
-    float: right;
-  }
-}

themes/yilia/source-src/css/mobile.scss

@@ -220,6 +220,9 @@ html, body, #container {
         display: block;
     }
 }
+#comments {
+    margin: 0;
+}
 .share{
     padding: 3px 10px;
 }