modify landing position

17 files changed, 35 insertions, 62 deletions

diff --git a/docs/landing/_site/cn/index.html b/docs/cn/index.html
index 892a8c851..56fdd5ae3 100644
--- a/docs/landing/_site/cn/index.html
+++ b/docs/cn/index.html
@@ -9,9 +9,9 @@
   <meta name="description" content="一个基于Lua的轻量级自动构建工具">
   <meta name="keywords" content="make,makefile,构建工具,编译工具,lua,跨平台,跨平台开发,linux,交叉编译" /> 
 
-  <link rel="stylesheet" href="/landing/_site/css/normalize.css">
-  <link rel='stylesheet' href="/landing/_site/css/opensans.css" type='text/css'>
-  <link rel="stylesheet" href="/landing/_site/css/cayman.css">
+  <link rel="stylesheet" href="/css/normalize.css">
+  <link rel='stylesheet' href="/css/opensans.css" type='text/css'>
+  <link rel="stylesheet" href="/css/cayman.css">
 
   <!-- baidu stats -->
     <script>
@@ -34,14 +34,14 @@
   <br><br>
   <iframe src="https://ghbtns.com/github-btn.html?user=tboox&repo=xmake&type=star&count=true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
     <span class="donate" style="width: 86px">
-      <img src="/landing/_site/img/patreon.png">
-      <a href="/landing/_site/cn/pages/donation.html#donate">支持我们</a>
+      <img src="/img/patreon.png">
+      <a href="/cn/pages/donation.html#donate">支持我们</a>
     </span>
   <br><br>
 <ul id="translations">
-      <li><a href="/landing/_site/cn/" class="nav-link">中文</a></li>
+      <li><a href="/cn/" class="nav-link">中文</a></li>
       <li class="delimiter">|</li>
-      <li><a href="/landing/_site/" class="nav-link">English</a></li>
+      <li><a href="/" class="nav-link">English</a></li>
     </ul>
 </section>
 
diff --git a/docs/landing/_site/cn/pages/donation.html b/docs/cn/pages/donation.html
index 40e06dfce..fcbc55aa1 100644
--- a/docs/landing/_site/cn/pages/donation.html
+++ b/docs/cn/pages/donation.html
@@ -9,9 +9,9 @@
   <meta name="description" content="一个基于Lua的轻量级自动构建工具">
   <meta name="keywords" content="make,makefile,构建工具,编译工具,lua,跨平台,跨平台开发,linux,交叉编译" /> 
 
-  <link rel="stylesheet" href="/landing/_site/css/normalize.css">
-  <link rel='stylesheet' href="/landing/_site/css/opensans.css" type='text/css'>
-  <link rel="stylesheet" href="/landing/_site/css/cayman.css">
+  <link rel="stylesheet" href="/css/normalize.css">
+  <link rel='stylesheet' href="/css/opensans.css" type='text/css'>
+  <link rel="stylesheet" href="/css/cayman.css">
 
   <!-- baidu stats -->
     <script>
@@ -34,14 +34,14 @@
   <br><br>
   <iframe src="https://ghbtns.com/github-btn.html?user=tboox&repo=xmake&type=star&count=true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
     <span class="donate" style="width: 86px">
-      <img src="/landing/_site/img/patreon.png">
-      <a href="/landing/_site/cn/pages/donation.html#donate">支持我们</a>
+      <img src="/img/patreon.png">
+      <a href="/cn/pages/donation.html#donate">支持我们</a>
     </span>
   <br><br>
 <ul id="translations">
-      <li><a href="/landing/_site/cn/" class="nav-link">中文</a></li>
+      <li><a href="/cn/" class="nav-link">中文</a></li>
       <li class="delimiter">|</li>
-      <li><a href="/landing/_site/" class="nav-link">English</a></li>
+      <li><a href="/" class="nav-link">English</a></li>
     </ul>
 </section>
 
@@ -55,13 +55,13 @@
 
 <h2 id="section">支付宝</h2>
 
-<p><img src="/landing/_site/img/alipay.png" alt="alipay" width="256" height="256" /></p>
+<p><img src="/img/alipay.png" alt="alipay" width="256" height="256" /></p>
 
 <p>账号：[email protected]</p>
 
 <h2 id="section-1">微信</h2>
 
-<p><img src="/landing/_site/img/weixin.png" alt="weixin" width="218" height="218" /></p>
+<p><img src="/img/weixin.png" alt="weixin" width="218" height="218" /></p>
 
 <h2 id="paypal">Paypal</h2>
 
diff --git a/docs/config.js b/docs/config.js
index 70b79a3d7..53f62bda7 100644
--- a/docs/config.js
+++ b/docs/config.js
@@ -4,7 +4,7 @@ var langs = [
 ]
 
 self.$config = {
-    landing: '/landing/_site/index.html',
+    landing: true,
     repo: 'tboox/xmake',
     twitter: 'waruqi',
     url: 'http://xmake.io',
diff --git a/docs/landing/_site/css/cayman.css b/docs/css/cayman.css
index b67d1e8fa..b67d1e8fa 100755
--- a/docs/landing/_site/css/cayman.css
+++ b/docs/css/cayman.css
diff --git a/docs/landing/_site/css/normalize.css b/docs/css/normalize.css
index 30366a6e9..30366a6e9 100755
--- a/docs/landing/_site/css/normalize.css
+++ b/docs/css/normalize.css
diff --git a/docs/landing/_site/css/opensans.css b/docs/css/opensans.css
index ebac7ce81..ebac7ce81 100644
--- a/docs/landing/_site/css/opensans.css
+++ b/docs/css/opensans.css
diff --git a/docs/landing/_site/img/alipay.png b/docs/img/alipay.png
index bc1088d0f..bc1088d0f 100644
--- a/docs/landing/_site/img/alipay.png
+++ b/docs/img/alipay.png
diff --git a/docs/landing/_site/img/donate.gif b/docs/img/donate.gif
index d6df5107e..d6df5107e 100644
--- a/docs/landing/_site/img/donate.gif
+++ b/docs/img/donate.gif
diff --git a/docs/landing/_site/img/patreon.png b/docs/img/patreon.png
index aa0e4aee1..aa0e4aee1 100644
--- a/docs/landing/_site/img/patreon.png
+++ b/docs/img/patreon.png
diff --git a/docs/landing/_site/img/paypal.png b/docs/img/paypal.png
index 780c84f6c..780c84f6c 100644
--- a/docs/landing/_site/img/paypal.png
+++ b/docs/img/paypal.png
diff --git a/docs/landing/_site/img/weixin.png b/docs/img/weixin.png
index 1b1880b94..1b1880b94 100644
--- a/docs/landing/_site/img/weixin.png
+++ b/docs/img/weixin.png
diff --git a/docs/landing/_site/index.html b/docs/landing.html
index 71f4d7515..51e14bc55 100644
--- a/docs/landing/_site/index.html
+++ b/docs/landing.html
@@ -9,9 +9,9 @@
   <meta name="description" content="A make-like build utility based on Lua">
   <meta name="keywords" content="make,makefile,build,lua,cross-compile,linux" /> 
 
-  <link rel="stylesheet" href="/landing/_site/css/normalize.css">
-  <link rel='stylesheet' href="/landing/_site/css/opensans.css" type='text/css'>
-  <link rel="stylesheet" href="/landing/_site/css/cayman.css">
+  <link rel="stylesheet" href="/css/normalize.css">
+  <link rel='stylesheet' href="/css/opensans.css" type='text/css'>
+  <link rel="stylesheet" href="/css/cayman.css">
 
   <!-- baidu stats -->
     <script>
@@ -34,14 +34,14 @@
   <br><br>
   <iframe src="https://ghbtns.com/github-btn.html?user=tboox&repo=xmake&type=star&count=true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
     <span class="donate" style="width: 100px">
-      <img src="/landing/_site/img/patreon.png">
-      <a href="/landing/_site/pages/donation.html#donate">Support us</a>
+      <img src="/img/patreon.png">
+      <a href="/pages/donation.html#donate">Support us</a>
     </span>
   <br><br>
   <ul id="translations">
-      <li><a href="/landing/_site/cn/" class="nav-link">中文</a></li>
+      <li><a href="/cn/" class="nav-link">中文</a></li>
       <li class="delimiter">|</li>
-      <li><a href="/landing/_site/" class="nav-link">English</a></li>
+      <li><a href="/" class="nav-link">English</a></li>
     </ul>
 </section>
 
diff --git a/docs/landing/README.md b/docs/landing/README.md
index 289c99539..228eebfbd 100755
--- a/docs/landing/README.md
+++ b/docs/landing/README.md
@@ -13,10 +13,7 @@ $ jekyll serve
 # Publishing site
 
 ```
-$ ./build gh-pages
-$ git commit -a -m "..."
-$ git push origin gh-pages
-$ git checkout sitesrc
+$ ./build 
 ```
 
 For more details read about [Jekyll][1] on its web page.
diff --git a/docs/landing/_config.yml b/docs/landing/_config.yml
index 0a2174f79..4c46dd423 100755
--- a/docs/landing/_config.yml
+++ b/docs/landing/_config.yml
@@ -4,7 +4,7 @@ tagline:      A make-like build utility based on Lua
 tagline-cn:   一个基于Lua的轻量级自动构建工具
 keywords:     make,makefile,build,lua,cross-compile,linux
 keywords-cn:  make,makefile,构建工具,编译工具,lua,跨平台,跨平台开发,linux,交叉编译
-baseurl:      "/landing/_site"
+baseurl:      ""
 paginate:     1
 
 # About/contact
diff --git a/docs/landing/_site/README.md b/docs/landing/_site/README.md
deleted file mode 100755
index 289c99539..000000000
--- a/docs/landing/_site/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# xmake.io
-
-This is a [Jekyll][1] theme for [@jasonlong][2]'s [Cayman theme][4] on [GitHub Pages][3].
-
-# Developing
-
-Start a local server at localhost:4000:
-
-```
-$ jekyll serve
-```
-
-# Publishing site
-
-```
-$ ./build gh-pages
-$ git commit -a -m "..."
-$ git push origin gh-pages
-$ git checkout sitesrc
-```
-
-For more details read about [Jekyll][1] on its web page.
-
-
diff --git a/docs/landing/_site/favicon.ico b/docs/landing/_site/favicon.ico
deleted file mode 100644
index 3a3fe3f52..000000000
--- a/docs/landing/_site/favicon.ico
+++ /dev/null
diff --git a/docs/landing/_site/pages/donation.html b/docs/pages/donation.html
index 15b9b8b67..6e74ab531 100644
--- a/docs/landing/_site/pages/donation.html
+++ b/docs/pages/donation.html
@@ -9,9 +9,9 @@
   <meta name="description" content="A make-like build utility based on Lua">
   <meta name="keywords" content="make,makefile,build,lua,cross-compile,linux" /> 
 
-  <link rel="stylesheet" href="/landing/_site/css/normalize.css">
-  <link rel='stylesheet' href="/landing/_site/css/opensans.css" type='text/css'>
-  <link rel="stylesheet" href="/landing/_site/css/cayman.css">
+  <link rel="stylesheet" href="/css/normalize.css">
+  <link rel='stylesheet' href="/css/opensans.css" type='text/css'>
+  <link rel="stylesheet" href="/css/cayman.css">
 
   <!-- baidu stats -->
     <script>
@@ -34,14 +34,14 @@
   <br><br>
   <iframe src="https://ghbtns.com/github-btn.html?user=tboox&repo=xmake&type=star&count=true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
     <span class="donate" style="width: 100px">
-      <img src="/landing/_site/img/patreon.png">
-      <a href="/landing/_site/pages/donation.html#donate">Support us</a>
+      <img src="/img/patreon.png">
+      <a href="/pages/donation.html#donate">Support us</a>
     </span>
   <br><br>
   <ul id="translations">
-      <li><a href="/landing/_site/cn/" class="nav-link">中文</a></li>
+      <li><a href="/cn/" class="nav-link">中文</a></li>
       <li class="delimiter">|</li>
-      <li><a href="/landing/_site/" class="nav-link">English</a></li>
+      <li><a href="/" class="nav-link">English</a></li>
     </ul>
 </section>
 
@@ -61,11 +61,11 @@
 
 <h2 id="alipay">Alipay</h2>
 
-<p><img src="/landing/_site/img/alipay.png" alt="alipay" width="256" height="256" /></p>
+<p><img src="/img/alipay.png" alt="alipay" width="256" height="256" /></p>
 
 <h2 id="weixin">Weixin</h2>
 
-<p><img src="/landing/_site/img/weixin.png" alt="weixin" width="218" height="218" /></p>
+<p><img src="/img/weixin.png" alt="weixin" width="218" height="218" /></p>
 
 <h2 id="supporters">Supporters</h2>