Merge remote-tracking branch 'lsrdg/dev' into merge_sass

docs/_config.yml

@@ -15,6 +15,11 @@ plugins:
 
 github: [metadata]
 
+<<<<<<< HEAD
+sass:
+ sass_dir: _sass
+ style: compressed
+=======
 author:
       name: Shidong Wang
       twitter: SpaceVim
@@ -27,3 +32,4 @@ social:
       - https://twitter.com/SpaceVim
       - https://github.com/SpaceVim/SpaceVim
       - https://www.reddit.com/r/SpaceVim/
+>>>>>>> 8b84e4959a542fba3aa7692e26d8fcc9ff4ae029

docs/_layouts/default.html

@@ -29,6 +29,52 @@
                 'gtm.start': new Date().getTime(),
                 event: 'gtm.js'
             });
+<<<<<<< HEAD
+        </script>
+        <script type="application/ld+json">
+            { 
+                "@context": "http://schema.org", 
+                "@type": "WebSite", 
+                "url": "https://spacevim.org/", 
+                "name": "{{ page.title | default: Home }} - SpaceVim",
+                "author": {
+                    "@type": "Person",
+                    "name": "Shidong Wang"
+                },
+                "description": "{{ site.description }}",
+                "publisher": "Shidong Wang",
+                "potentialAction": { 
+                    "@type": "SearchAction", 
+                    "target": "https://spacevim.org/?s={search_term}", 
+                    "query-input": "required name=search_term" } 
+            }
+        </script>
+        <script>
+            var _hmt = _hmt || [];
+(function() {
+    var hm = document.createElement("script");
+    hm.src = "https://hm.baidu.com/hm.js?c6bde3c13e6fd8fde7357f71b4dd53a7";
+    var s = document.getElementsByTagName("script")[0]; 
+    s.parentNode.insertBefore(hm, s);
+})();
+        </script>
+        <script type="text/javascript" src="http://tajs.qq.com/stats?sId=60680063" charset="UTF-8"></script> 
+        <!-- Google Tag Manager -->
+        <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+            new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+                j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+                'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+        })(window,document,'script','dataLayer','GTM-PCLWNCD');
+        </script>
+        <!-- End Google Tag Manager -->
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="chrome=1">
+        <title>{{ page.title | default: Home }} - SpaceVim</title>
+        <link rel="stylesheet" href="{{ '/assets/css/main.css?v=' | append: site.github.build_revision | relative_url }}">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+        <script src="{{ '/assets/js/respond.js' | relative_url }}"></script>
+        <!--[if lt IE 9]>
+=======
             var f = d.getElementsByTagName(s)[0],
                 j = d.createElement(s),
                 dl = l != 'dataLayer' ? '&l=' + l : '';
@@ -45,6 +91,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
     <script src="{{ '/assets/js/respond.js' | relative_url }}"></script>
     <!--[if lt IE 9]>
+>>>>>>> 8b84e4959a542fba3aa7692e26d8fcc9ff4ae029
         <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
     <!--[if lt IE 8]>

docs/_sass/_spacevim.scss

@@ -1,3 +1,8 @@
+@charset "utf-8";
+
+// Variables
+@import "variables";
+
 /*! normalize.css 2012-02-07T12:37 UTC - https://github.com/necolas/normalize.css */
 /* ============================================================================= HTML5 display definitions ========================================================================== */
 /* Corrects block display not defined in IE6/7/8/9 & FF3 */
@@ -214,13 +219,17 @@ p, ul, ol, table, pre, dl { margin: 0 0 20px; }
 
 h1, h2, h3 { line-height: 1.1; }
 
-h1 { font-size: 28px; }
+h1 { font-size: $h1-font-size; }
 
-h2 { font-size: 24px; }
+h2 { font-size: $h2-font-size; }
 
 h4, h5, h6 { color: #e8e8e8; }
 
-h3 { font-size: 18px; line-height: 24px; font-family: 'OpenSansRegular', "Helvetica Neue", Helvetica, Arial, sans-serif !important; font-weight: normal; color: #b6b6b6; }
+h3 { font-size: $h3-font-size; line-height: 24px; font-family: 'OpenSansRegular', "Helvetica Neue", Helvetica, Arial, sans-serif !important; font-weight: normal; color: #b6b6b6; }
+
+h4 { font-size: $h4-font-size; }
+h5 { font-size: $h5-font-size; }
+h6 { font-size: $h6-font-size; }
 
 a { color: #ffcc00; font-weight: 400; text-decoration: none; }
 a:hover { color: #ffeb9b; }

docs/_sass/_variables.scss

@@ -0,0 +1,7 @@
+$h1-font-size: 3em;
+$h2-font-size: 2.75em;
+$h3-font-size: 2.5em;
+$h4-font-size: 2.25em;
+$h5-font-size: 2em;
+$h6-font-size: 1.75em;
+

docs/assets/css/main.scss

@@ -0,0 +1,6 @@
+---
+# this ensures Jekyll reads the file to be transformed into CSS later
+# only Main files contain this front matter, not partials.
+---
+
+@import "_spacevim.scss";