mirror of
https://github.com/SpaceVim/SpaceVim.git
synced 2025-02-03 03:00:04 +08:00
Fix merge
This commit is contained in:
wsdjeg
parent
cb1c5af7b2
commit
46d2483719
@ -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
|
|
||||||
|
|||||||
@ -1,64 +1,34 @@
|
|||||||
<!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({
|
||||||
google_ad_client: "ca-pub-5073224535135889",
|
google_ad_client: "ca-pub-5073224535135889",
|
||||||
enable_page_level_ads: true
|
enable_page_level_ads: true
|
||||||
});
|
|
||||||
</script>
|
|
||||||
<meta name="baidu-site-verification" content="TUNbZyzuOn" />
|
|
||||||
{% seo %}
|
|
||||||
<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'
|
|
||||||
});
|
});
|
||||||
<<<<<<< HEAD
|
|
||||||
</script>
|
</script>
|
||||||
<script type="application/ld+json">
|
<meta name="baidu-site-verification" content="TUNbZyzuOn" />
|
||||||
{
|
{% seo %}
|
||||||
"@context": "http://schema.org",
|
<script type="text/javascript" src="http://tajs.qq.com/stats?sId=60680063" charset="UTF-8"></script>
|
||||||
"@type": "WebSite",
|
<script>
|
||||||
"url": "https://spacevim.org/",
|
(function(w, d, s, l, i) {
|
||||||
"name": "{{ page.title | default: Home }} - SpaceVim",
|
w[l] = w[l] || [];
|
||||||
"author": {
|
w[l].push({
|
||||||
"@type": "Person",
|
'gtm.start': new Date().getTime(),
|
||||||
"name": "Shidong Wang"
|
event: 'gtm.js'
|
||||||
},
|
});
|
||||||
"description": "{{ site.description }}",
|
|
||||||
"publisher": "Shidong Wang",
|
|
||||||
"potentialAction": {
|
|
||||||
"@type": "SearchAction",
|
|
||||||
"target": "https://spacevim.org/?s={search_term}",
|
|
||||||
"query-input": "required name=search_term" }
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
<script>
|
<script>
|
||||||
var _hmt = _hmt || [];
|
var _hmt = _hmt || [];
|
||||||
(function() {
|
(function() {
|
||||||
var hm = document.createElement("script");
|
var hm = document.createElement("script");
|
||||||
hm.src = "https://hm.baidu.com/hm.js?c6bde3c13e6fd8fde7357f71b4dd53a7";
|
hm.src = "https://hm.baidu.com/hm.js?c6bde3c13e6fd8fde7357f71b4dd53a7";
|
||||||
var s = document.getElementsByTagName("script")[0];
|
var s = document.getElementsByTagName("script")[0];
|
||||||
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 -->
|
<!-- 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,97 +43,73 @@
|
|||||||
<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]>
|
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
|
||||||
=======
|
<script>
|
||||||
var f = d.getElementsByTagName(s)[0],
|
(function() {
|
||||||
j = d.createElement(s),
|
var bp = document.createElement('script');
|
||||||
dl = l != 'dataLayer' ? '&l=' + l : '';
|
var curProtocol = window.location.protocol.split(':')[0];
|
||||||
j.async = true;
|
if (curProtocol === 'https') {
|
||||||
j.src =
|
bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
|
||||||
'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
|
} else {
|
||||||
f.parentNode.insertBefore(j, f);
|
bp.src = 'http://push.zhanzhang.baidu.com/push.js';
|
||||||
})(window, document, 'script', 'dataLayer', 'GTM-PCLWNCD');
|
}
|
||||||
</script>
|
var s = document.getElementsByTagName("script")[0];
|
||||||
<!-- End Google Tag Manager -->
|
s.parentNode.insertBefore(bp, s);
|
||||||
<meta charset="utf-8">
|
})();
|
||||||
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
</script>
|
||||||
<link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
|
</head>
|
||||||
<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">
|
|
||||||
<script>
|
|
||||||
(function() {
|
|
||||||
var bp = document.createElement('script');
|
|
||||||
var curProtocol = window.location.protocol.split(':')[0];
|
|
||||||
if (curProtocol === 'https') {
|
|
||||||
bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
|
|
||||||
} else {
|
|
||||||
bp.src = 'http://push.zhanzhang.baidu.com/push.js';
|
|
||||||
}
|
|
||||||
var s = document.getElementsByTagName("script")[0];
|
|
||||||
s.parentNode.insertBefore(bp, s);
|
|
||||||
})();
|
|
||||||
</script>
|
|
||||||
</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>
|
||||||
</noscript>
|
</noscript>
|
||||||
<!-- End Google Tag Manager (noscript) -->
|
<!-- End Google Tag Manager (noscript) -->
|
||||||
<a href="https://github.com/SpaceVim/SpaceVim">
|
<a href="https://github.com/SpaceVim/SpaceVim">
|
||||||
<img alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png" src="https://camo.githubusercontent.com/e7bbb0521b397edbd5fe43e7f760759336b5e05f/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677265656e5f3030373230302e706e67" style="position: absolute; top: 0; right: 0; border: 0;"/>
|
<img alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png" src="https://camo.githubusercontent.com/e7bbb0521b397edbd5fe43e7f760759336b5e05f/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677265656e5f3030373230302e706e67" style="position: absolute; top: 0; right: 0; border: 0;"/>
|
||||||
</a>
|
</a>
|
||||||
<div class="wrapper">
|
<div class="wrapper">
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<div id="title">
|
<div id="title">
|
||||||
<h1>{{ site.title | default: site.github.repository_name }}</h1>
|
<h1>{{ site.title | default: site.github.repository_name }}</h1>
|
||||||
<p>{{ site.description | default: site.github.project_tagline }}</p>
|
<p>{{ site.description | default: site.github.project_tagline }}</p>
|
||||||
<hr>
|
<hr>
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<b><a href="{{ site.url }}">Home</a></b> |
|
<b><a href="{{ site.url }}">Home</a></b> |
|
||||||
<b><a href="{{ site.url }}/about">About</a></b> |
|
<b><a href="{{ site.url }}/about">About</a></b> |
|
||||||
<b><a href="{{ site.url }}/documentation">Documentation</a></b> |
|
<b><a href="{{ site.url }}/documentation">Documentation</a></b> |
|
||||||
<b><a href="{{ site.url }}/development">Development</a></b> |
|
<b><a href="{{ site.url }}/development">Development</a></b> |
|
||||||
<b><a href="{{ site.url }}/community">Community</a></b> |
|
<b><a href="{{ site.url }}/community">Community</a></b> |
|
||||||
<b><a href="{{ site.url }}/sponsors">Sponsors</a></b>
|
<b><a href="{{ site.url }}/sponsors">Sponsors</a></b>
|
||||||
</p>
|
</p>
|
||||||
<hr>
|
<hr>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{ content }}
|
{{ content }}
|
||||||
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% if site.google_analytics %}
|
{% if site.google_analytics %}
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
|
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
|
||||||
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
|
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
|
||||||
</script>
|
</script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
try {
|
try {
|
||||||
var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
|
var pageTracker = _gat._getTracker("{{ site.google_analytics }}");
|
||||||
pageTracker._trackPageview();
|
pageTracker._trackPageview();
|
||||||
} catch (err) {}
|
} catch (err) {}
|
||||||
</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 — Theme by <a href="https://twitter.com/michigangraham">mattgraham</a></span>
|
<span class="credits right">Hosted on GitHub — Theme by <a href="https://twitter.com/michigangraham">mattgraham</a></span>
|
||||||
</p>
|
</p>
|
||||||
</root>
|
</root>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user