fix NPM so i can use Grunt and Less now, Social-Comments feature done…

…: use Duoshuo
lianxin255 · Feb 1, 2015 · fd70486 · fd70486
1 parent c1d6b4f
commit fd70486
Show file tree

Hide file tree

Showing 15 changed files with 116 additions and 59 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -31,7 +31,6 @@ module.exports = function(grunt) {
         banner: '/*!\n' +
             ' * <%= pkg.title %> v<%= pkg.version %> (<%= pkg.homepage %>)\n' +
             ' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
-            ' * Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n' +
             ' */\n',
         usebanner: {
             dist: {

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -84,4 +84,4 @@
 <script src="{{ "/js/bootstrap.min.js " | prepend: site.baseurl }}"></script>
 
 <!-- Custom Theme JavaScript -->
-<script src="{{ "/js/clean-blog.min.js " | prepend: site.baseurl }}"></script>
+<script src="{{ "/js/hux-blog.min.js " | prepend: site.baseurl }}"></script>
diff --git a/_includes/head.html b/_includes/head.html
@@ -14,7 +14,7 @@
     <link rel="stylesheet" href="{{ "/css/bootstrap.min.css" | prepend: site.baseurl }}">
 
     <!-- Custom CSS -->
-    <link rel="stylesheet" href="{{ "/css/clean-blog.css" | prepend: site.baseurl }}">
+    <link rel="stylesheet" href="{{ "/css/hux-blog.css" | prepend: site.baseurl }}">
 
     <!-- Pygments Github CSS -->
     <link rel="stylesheet" href="{{ "/css/syntax.css" | prepend: site.baseurl }}">

diff --git a/_layouts/page.html b/_layouts/page.html
@@ -27,3 +27,4 @@ <h1>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</h1
 </div>
 
 
+
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -9,9 +9,12 @@
             <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
                 <div class="post-heading">
                     <h1>{{ page.title }}</h1>
-                    {% if page.subtitle %}
+                    {% comment %} 
+                        always create a h2 for keeping the margin , Hux 
+                    {% endcomment %}
+                    {% comment %} if page.subtitle {% endcomment %} 
                     <h2 class="subheading">{{ page.subtitle }}</h2>
-                    {% endif %}
+                    {% comment %} endif {% endcomment %}
                     <span class="meta">Posted by {% if page.author %}{{ page.author }}{% else %}{{ site.title }}{% endif %} on {{ page.date | date: "%B %-d, %Y" }}</span>
                 </div>
             </div>
@@ -42,9 +45,26 @@ <h2 class="subheading">{{ page.subtitle }}</h2>
                     {% endif %}
                 </ul>
 
+                <!-- 多说评论框 start -->
+                    <div class="ds-thread" data-thread-key="{{page.id}}" data-title="{{page.title}}"></div>
+                <!-- 多说评论框 end -->
+
             </div>
         </div>
     </div>
 </article>
 
 
+<!-- 多说公共JS代码 start (一个网页只需插入一次) -->
+<script type="text/javascript">
+var duoshuoQuery = {short_name:"huxblog"};
+    (function() {
+        var ds = document.createElement('script');
+        ds.type = 'text/javascript';ds.async = true;
+        ds.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + '//static.duoshuo.com/embed.js';
+        ds.charset = 'UTF-8';
+        (document.getElementsByTagName('head')[0] 
+         || document.getElementsByTagName('body')[0]).appendChild(ds);
+    })();
+</script>
+<!-- 多说公共JS代码 end -->
diff --git a/css/.DS_Store b/css/.DS_Store
diff --git a/css/clean-blog.min.css b/css/clean-blog.min.css
diff --git a/css/clean-blog.css → css/hux-blog.css b/css/clean-blog.css → css/hux-blog.css
@@ -1,28 +1,32 @@
+/*!
+ * Hux Blog v1.0.0 (http://huxpro.github.io)
+ * Copyright 2015 Hux
+ */
+
 body {
-  font-family: 'Lora', 'Times New Roman', serif;
+  font: normal 16px/1.7 "Helvetica Neue", Arial, "Hiragino Sans GB", "STHeiti", "Microsoft YaHei", "WenQuanYi Micro Hei", SimSun, sans-serif;
   font-size: 16px;
-  /*// Hux mpdify to 16px (Mobile First), and increase to 20px while 768+ width*/
   color: #404040;
-  font: normal 16px/1.70 "Helvetica Neue",Arial,"Hiragino Sans GB","STHeiti","Microsoft YaHei","WenQuanYi Micro Hei",SimSun,sans-serif;
 }
 p {
   margin: 30px 0;
 }
 p a {
   text-decoration: underline;
 }
-h1{
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-}
 h1,
 h2,
 h3,
 h4,
 h5,
 h6 {
-  /*font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;*/
+  font: normal 16px/1.7 "Helvetica Neue", Arial, "Hiragino Sans GB", "STHeiti", "Microsoft YaHei", "WenQuanYi Micro Hei", SimSun, sans-serif;
+  line-height: 1.1;
   font-weight: 800;
 }
+h1 {
+  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
 a {
   color: #404040;
 }
@@ -52,7 +56,7 @@ hr.small {
   left: 0;
   width: 100%;
   z-index: 3;
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  font: normal 16px/1.7 "Helvetica Neue", Arial, "Hiragino Sans GB", "STHeiti", "Microsoft YaHei", "WenQuanYi Micro Hei", SimSun, sans-serif;
 }
 .navbar-custom .navbar-brand {
   font-weight: 800;
@@ -64,11 +68,13 @@ hr.small {
   letter-spacing: 1px;
 }
 @media only screen and (min-width: 768px) {
-  body{font-size:17px;}
   .navbar-custom {
     background: transparent;
     border-bottom: 1px solid transparent;
   }
+  .navbar-custom body {
+    font-size: 20px;
+  }
   .navbar-custom .navbar-brand {
     color: white;
     padding: 20px;
@@ -141,7 +147,8 @@ hr.small {
   -moz-background-size: cover;
   background-size: cover;
   -o-background-size: cover;
-  margin-bottom: 20px;  /* origin-value: 50px, modify by Hux */
+  margin-bottom: 20px;
+  /* origin-value: 50px, modify by Hux */
 }
 .intro-header .site-heading,
 .intro-header .post-heading,
@@ -167,10 +174,10 @@ hr.small {
 }
 .intro-header .site-heading .subheading,
 .intro-header .page-heading .subheading {
+  font: normal 16px/1.7 "Helvetica Neue", Arial, "Hiragino Sans GB", "STHeiti", "Microsoft YaHei", "WenQuanYi Micro Hei", SimSun, sans-serif;
   font-size: 24px;
   line-height: 1.1,
 			display: block;
-  /*font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;*/
   font-weight: 300;
   margin: 10px 0 0;
 }
@@ -189,10 +196,9 @@ hr.small {
   display: block;
 }
 .intro-header .post-heading .subheading {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  font: normal 16px/1.7 "Helvetica Neue", Arial, "Hiragino Sans GB", "STHeiti", "Microsoft YaHei", "WenQuanYi Micro Hei", SimSun, sans-serif;
   font-size: 20px;
   margin: 10px 0 30px;
-  font-weight: 600;
 }
 .intro-header .post-heading .meta {
   font-family: 'Lora', 'Times New Roman', serif;
@@ -210,7 +216,7 @@ hr.small {
   .intro-header .post-heading .subheading {
     font-size: 30px;
   }
-  .intro-header .post-heading .meta{
+  .intro-header .post-heading .meta {
     font-size: 20px;
   }
 }
@@ -229,15 +235,15 @@ hr.small {
   margin-bottom: 10px;
 }
 .post-preview > a > .post-subtitle {
+  font-size: 14px;
   margin: 0;
   font-weight: 300;
   margin-bottom: 10px;
-  font-size: 14px;
 }
 .post-preview > .post-meta {
+  font-family: 'Lora', 'Times New Roman', serif;
   color: #808080;
   font-size: 16px;
-  font-family: 'Times New Roman';
   font-style: italic;
   margin-top: 0;
 }
@@ -253,12 +259,12 @@ hr.small {
 @media only screen and (min-width: 768px) {
   .post-preview > a > .post-title {
     font-size: 26px;
-    line-height: 1.3
+    line-height: 1.3;
   }
   .post-preview > a > .post-subtitle {
     font-size: 16px;
   }
-  .post-preview > .post-meta {
+  .post-preview .post-meta {
     font-size: 18px;
   }
 }
@@ -278,8 +284,8 @@ hr.small {
   border-bottom-left-radius: 5px;
 }
 footer {
-  padding: 50px 0 65px;
   font-size: 20px;
+  padding: 50px 0 65px;
 }
 footer .list-inline {
   margin: 0;
@@ -341,7 +347,7 @@ form .row:first-child .floating-label-form-group {
   border-top: 1px solid #eeeeee;
 }
 .btn {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  font: normal 16px/1.7 "Helvetica Neue", Arial, "Hiragino Sans GB", "STHeiti", "Microsoft YaHei", "WenQuanYi Micro Hei", SimSun, sans-serif;
   text-transform: uppercase;
   font-size: 14px;
   font-weight: 800;
@@ -364,7 +370,7 @@ form .row:first-child .floating-label-form-group {
 }
 .pager li > a,
 .pager li > span {
-  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  font: normal 16px/1.7 "Helvetica Neue", Arial, "Hiragino Sans GB", "STHeiti", "Microsoft YaHei", "WenQuanYi Micro Hei", SimSun, sans-serif;
   text-transform: uppercase;
   font-size: 14px;
   font-weight: 800;
@@ -415,14 +421,11 @@ img::-moz-selection {
 body {
   webkit-tap-highlight-color: #0085a1;
 }
-
 /* Hux Optimize UserExperience */
-
-.navbar-default .navbar-toggle:focus, .navbar-default .navbar-toggle:hover{
+.navbar-default .navbar-toggle:focus,
+.navbar-default .navbar-toggle:hover {
   background-color: inherit;
 }
-
-.navbar-default .navbar-toggle:active{
+.navbar-default .navbar-toggle:active {
   background-color: #ddd;
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,3 +27,4 @@ <h1>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</h1
		</div>