Gaze/SpaceVim
1
0
Fork 0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-02-09 13:50:06 +08:00
Code Issues Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
wsdjeg 2017-12-08 21:23:58 +08:00
parent cb1c5af7b2
commit 46d2483719
2 changed files with 81 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/_config.yml
View File

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

84
docs/_layouts/default.html
View File

@ -1,7 +1,7 @@
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script> <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<script> <script>
(adsbygoogle = window.adsbygoogle || []).push({ (adsbygoogle = window.adsbygoogle || []).push({
@ -11,6 +11,15 @@
</script> </script>
<meta name="baidu-site-verification" content="TUNbZyzuOn" /> <meta name="baidu-site-verification" content="TUNbZyzuOn" />
{% seo %} {% seo %}
<script type="text/javascript" src="http://tajs.qq.com/stats?sId=60680063" charset="UTF-8"></script>
<script>
(function(w, d, s, l, i) {
w[l] = w[l] || [];
w[l].push({
'gtm.start': new Date().getTime(),
event: 'gtm.js'
});
</script>
<script> <script>
var _hmt = _hmt || []; var _hmt = _hmt || [];
(function() { (function() {
@ -20,45 +29,6 @@
s.parentNode.insertBefore(hm, s); s.parentNode.insertBefore(hm, s);
})(); })();
</script> </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'
});
<<<<<<< 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 --> <!-- Google Tag Manager -->
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': <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], new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
@ -73,30 +43,6 @@
<link rel="stylesheet" href="{{ '/assets/css/main.css?v=' | append: site.github.build_revision | relative_url }}"> <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="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script src="{{ '/assets/js/respond.js' | relative_url }}"></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 : '';
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">
<link rel="stylesheet" href="{{ '/assets/css/style.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]>
>>>>>>> 8b84e4959a542fba3aa7692e26d8fcc9ff4ae029
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!--[if lt IE 8]>
<link rel="stylesheet" href="{{ '/assets/css/ie.css' | relative_url }}">
<![endif]-->
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<script> <script>
(function() { (function() {
@ -111,9 +57,9 @@
s.parentNode.insertBefore(bp, s); s.parentNode.insertBefore(bp, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<!-- Google Tag Manager (noscript) --> <!-- Google Tag Manager (noscript) -->
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-PCLWNCD" <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-PCLWNCD"
height="0" width="0" style="display:none;visibility:hidden"></iframe> height="0" width="0" style="display:none;visibility:hidden"></iframe>
@ -159,11 +105,11 @@
</script> </script>
{% endif %} {% endif %}
<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-58a01d3aac22bd89"></script> <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-58a01d3aac22bd89"></script>
</body> </body>
<root> <root>
<p align="center"> <p align="center">
<span class="credits right">Hosted on GitHub &mdash; Theme by <a href="https://twitter.com/michigangraham">mattgraham</a></span> <span class="credits right">Hosted on GitHub &mdash; Theme by <a href="https://twitter.com/michigangraham">mattgraham</a></span>
</p> </p>
</root> </root>
</html> </html>