Repository: incubator-weex Updated Branches: refs/heads/master 4bc653653 -> 5ae6fe419
* [doc] modify the weex official website document style. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5ae6fe41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5ae6fe41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5ae6fe41 Branch: refs/heads/master Commit: 5ae6fe4196b302f266f3bb8ee42e0a6fc201a222 Parents: 4bc6536 Author: erha19 <faterr...@gmail.com> Authored: Mon Oct 9 17:55:33 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Mon Oct 9 19:47:52 2017 +0800 ---------------------------------------------------------------------- doc/themes/weex/layout/_partial/article.ejs | 2 ++ doc/themes/weex/layout/index.ejs | 3 +++ doc/themes/weex/layout/layout.ejs | 2 -- doc/themes/weex/source/css/common.scss | 4 ++-- doc/themes/weex/source/css/partial/header.scss | 2 +- doc/themes/weex/source/css/post.scss | 7 ++++--- doc/themes/weex/source/css/variable.scss | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ae6fe41/doc/themes/weex/layout/_partial/article.ejs ---------------------------------------------------------------------- diff --git a/doc/themes/weex/layout/_partial/article.ejs b/doc/themes/weex/layout/_partial/article.ejs index 3ee5b2a..e7052b7 100644 --- a/doc/themes/weex/layout/_partial/article.ejs +++ b/doc/themes/weex/layout/_partial/article.ejs @@ -8,4 +8,6 @@ <% if (page_type === 'article') { %> <%- partial('_partial/post/nav') %> <% } %> + <%- partial('footer') %> + <%- partial('after-footer') %> </article> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ae6fe41/doc/themes/weex/layout/index.ejs ---------------------------------------------------------------------- diff --git a/doc/themes/weex/layout/index.ejs b/doc/themes/weex/layout/index.ejs index 4a1ad87..b713fd4 100644 --- a/doc/themes/weex/layout/index.ejs +++ b/doc/themes/weex/layout/index.ejs @@ -250,6 +250,9 @@ </div> </div> <a href="javascript:;" id="back2top" class="back2top"><span class="iconfont icon-arrow-small"></span></a> +<%- partial('_partial/footer') %> +<%- partial('_partial/after-footer') %> + <%- js('js/swiper.min') %> <%- js('js/velocity.js') %> <script> http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ae6fe41/doc/themes/weex/layout/layout.ejs ---------------------------------------------------------------------- diff --git a/doc/themes/weex/layout/layout.ejs b/doc/themes/weex/layout/layout.ejs index df3b12b..ba6dee3 100644 --- a/doc/themes/weex/layout/layout.ejs +++ b/doc/themes/weex/layout/layout.ejs @@ -9,8 +9,6 @@ <%- partial('_partial/sidebar', {post: page, page_type: page_type}) %> <%- body %> - <%- partial('_partial/footer') %> - <%- partial('_partial/after-footer') %> <%- js('js/reqwest.js') %> <%- js('js/common.js') %> <% if (config.docsearch.enable){ %> http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ae6fe41/doc/themes/weex/source/css/common.scss ---------------------------------------------------------------------- diff --git a/doc/themes/weex/source/css/common.scss b/doc/themes/weex/source/css/common.scss index 10c25cf..d03be9f 100644 --- a/doc/themes/weex/source/css/common.scss +++ b/doc/themes/weex/source/css/common.scss @@ -17,9 +17,9 @@ html, body { } body { - background: $bg-gray; + background: $bg-white; // font-family: Exo,'-apple-system','Open Sans',HelveticaNeue-Light,'Helvetica Neue Light','Helvetica Neue','Hiragino Sans GB','Microsoft YaHei',Helvetica,Arial,sans-serif; - font-family: Lato, "Microsoft Jhenghei", "Hiragino Sans GB", "Microsoft YaHei", sans-serif,'-apple-system','Open Sans',HelveticaNeue-Light,'Helvetica Neue Light'; + font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif; // font-family: 'PingFang SC', 'Hiragino Sans GB', 'Microsoft Yahei', 'WenQuanYi Micro Hei',sans-serif; // font-size:62.5%;max-height:100%; font-size: 14px; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ae6fe41/doc/themes/weex/source/css/partial/header.scss ---------------------------------------------------------------------- diff --git a/doc/themes/weex/source/css/partial/header.scss b/doc/themes/weex/source/css/partial/header.scss index ac02f1a..a45d8f7 100644 --- a/doc/themes/weex/source/css/partial/header.scss +++ b/doc/themes/weex/source/css/partial/header.scss @@ -6,7 +6,7 @@ padding: 0 40px; position: fixed; background-color: rgba(255, 255, 255, .95); - box-shadow: 3px 2px 4px 0 rgba(0,0,0,0.12); + box-shadow: 0 0 1px rgba(0,0,0,0.25); top: 0; left: 0; right: 0; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ae6fe41/doc/themes/weex/source/css/post.scss ---------------------------------------------------------------------- diff --git a/doc/themes/weex/source/css/post.scss b/doc/themes/weex/source/css/post.scss index f3a6544..370d90c 100644 --- a/doc/themes/weex/source/css/post.scss +++ b/doc/themes/weex/source/css/post.scss @@ -50,14 +50,15 @@ } .doc-nav { - position: absolute; + position: fixed; top: 72px; left: 0; bottom: 0; - background: $bg-gray; + width: 260px; + padding: 40px 20px 60px 60px; + background: $bg-white; width: 300px; z-index: 999; - padding: 43px 15px 15px; overflow-x: hidden; overflow-y: auto; } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ae6fe41/doc/themes/weex/source/css/variable.scss ---------------------------------------------------------------------- diff --git a/doc/themes/weex/source/css/variable.scss b/doc/themes/weex/source/css/variable.scss index 50e35cd..cbe4b12 100644 --- a/doc/themes/weex/source/css/variable.scss +++ b/doc/themes/weex/source/css/variable.scss @@ -6,7 +6,7 @@ $text-light-black: #333; $text-black: #333; $text-white: #fff; $text-gray: #999; -$text-blue: #00BDFF; +$text-blue: #088bc3; $bg-blue: $text-blue; $bg-light-blue: #23CEFD; $bg-white: #fff;