From d7fb4fe1f575069fb62e79fc36968c86d3cc756d Mon Sep 17 00:00:00 2001
From: edisonxiang <xiang.edison@gmail.com>
Date: Wed, 11 Sep 2019 01:11:27 +0800
Subject: [PATCH] avoid the conflict with styles

---
 .../layouts/partials/docs/html-head.html      |  4 +--
 themes/project/layouts/partials/head.html     |  3 ---
 themes/project/layouts/partials/nav.html      | 26 -------------------
 themes/project/layouts/partials/scripts.html  |  3 ++-
 themes/project/static/css/custom.css          | 17 ++++++++++++
 5 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/themes/project/layouts/partials/docs/html-head.html b/themes/project/layouts/partials/docs/html-head.html
index 1c7ef08..0db4e5a 100644
--- a/themes/project/layouts/partials/docs/html-head.html
+++ b/themes/project/layouts/partials/docs/html-head.html
@@ -3,9 +3,9 @@
 <meta http-equiv="X-UA-Compatible" content="ie=edge">
 <title>{{ partial "docs/title" . }} | {{ .Site.Title -}}</title>
 
-<!-- Theme stylesheet, you can customize scss by creating `assets/custom.scss` in your website -->
+<!-- Theme stylesheet, you can customize scss by creating `assets/custom.scss` in your website
 {{- $styles := resources.Get "book.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint }}
-<link rel="stylesheet" href="{{ $styles.RelPermalink }}">
+<link rel="stylesheet" href="{{ $styles.RelPermalink }}">-->
 
 {{ if default true .Site.Params.BookSearch }}
 {{- $searchJS := resources.Get "search.js" | resources.ExecuteAsTemplate "search.js" . | resources.Minify | resources.Fingerprint }}
diff --git a/themes/project/layouts/partials/head.html b/themes/project/layouts/partials/head.html
index b92db6e..8a9cb8d 100644
--- a/themes/project/layouts/partials/head.html
+++ b/themes/project/layouts/partials/head.html
@@ -73,7 +73,4 @@
   <meta property="og:type" content="website" />
   <meta property="og:url" content="{{ .Permalink }}/" />
   <meta property="og:image" content="{{ .Site.Params.logo }}" />
-
-  <script src="{{ .Site.BaseURL }}js/flexible.js"></script>
-
 </head>
diff --git a/themes/project/layouts/partials/nav.html b/themes/project/layouts/partials/nav.html
index 654e30f..63019a4 100644
--- a/themes/project/layouts/partials/nav.html
+++ b/themes/project/layouts/partials/nav.html
@@ -1,29 +1,3 @@
-  <!-- 新增div盒子 
-  <div class="isPc pc_box">
-
-    <header>
-        <h2>openEuler</h2>
-        <ul>
-            <li class='on'>Home</li>
-            <li>Contribution</li>
-            <li>Get Start</li>
-            <li>Cooperation</li>
-            <li>Application Development</li>
-            <li>Docs</li>
-            <li>Download</li>
-            <li class="flex">
-                <img src="./images/search.svg" alt="搜索">
-            </li>
-            <li class="search">
-                <img src="./images/earth.svg">
-                <span>English</span>
-                <i></i>
-            </li>
-        </ul>
-    </header>
-
-</div>-->
-
 <div class="isPc navbar-affixed-top" data-spy="affix" data-offset-top="200">
 
     <div class="navbar navbar-default yamm" role="navigation" id="navbar">
diff --git a/themes/project/layouts/partials/scripts.html b/themes/project/layouts/partials/scripts.html
index e354312..6f1c163 100644
--- a/themes/project/layouts/partials/scripts.html
+++ b/themes/project/layouts/partials/scripts.html
@@ -23,8 +23,9 @@
 <script src="{{ .Site.BaseURL }}js/owl.carousel.min.js"></script>
 
 <!-- used to for mobile -->
-<div id="mask" onclick="hideNav()"></div>
+<script src="{{ .Site.BaseURL }}js/flexible.js"></script>
 <script src="{{ .Site.BaseURL }}js/common.js"></script>
+<div id="mask" onclick="hideNav()"></div>
 
 <script type="text/javascript">
     $(document).ready(function () {
diff --git a/themes/project/static/css/custom.css b/themes/project/static/css/custom.css
index 7c3b669..cb0087d 100644
--- a/themes/project/static/css/custom.css
+++ b/themes/project/static/css/custom.css
@@ -480,6 +480,23 @@ footer .notice span {
   max-width: 1920px;
 }*/
 
+.container .book-menu {
+  font-size: inherit;
+  flex: 0 0 5rem;
+}
+
+.container div.book-page {
+  margin-left: 30px;
+}
+
+.container div.book-page > header {
+  display: block;
+}
+
+.container aside.book-toc {
+  display: none;
+}
+
 html,
 body {
   position: relative;
-- 
GitLab