You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2019/09/16 18:35:10 UTC
[royale-docs] branch master updated: improve content layout
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/royale-docs.git
The following commit(s) were added to refs/heads/master by this push:
new 7e0a9fa improve content layout
7e0a9fa is described below
commit 7e0a9fab384f16e83c998091fb35c0cc54910044
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Mon Sep 16 20:35:03 2019 +0200
improve content layout
---
_layouts/docpage.html | 18 +++++++++---------
_sass/highlight.sass | 7 ++-----
_sass/royale-theme.sass | 38 +++++++++++++++++++++++++-------------
assets/css/styles.sass | 2 +-
4 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/_layouts/docpage.html b/_layouts/docpage.html
index 0013c5d..4015314 100644
--- a/_layouts/docpage.html
+++ b/_layouts/docpage.html
@@ -42,20 +42,20 @@ limitations under the License.
{% include header.html %}
<div class="toc_and_doc">
- <div class="page-content" id="content">
+ <div class="page-content">
<article>
{{content}}
+ <div class="bottom-links">
+ <a href="https://github.com/apache/royale-docs/edit/master/{{ page.path }}" target="_blank">Edit this page</a>
+ </div>
</article>
- <div class="bottom-links">
- <a href="https://github.com/apache/royale-docs/edit/master/{{ page.path }}" target="_blank">Edit this page</a>
+ <div class="toc">
+ <div align="center">
+ <input class="docsearch-input" type="search" placeholder="Search docs..." autocomplete="off" spellcheck="false"/>
+ </div>
+ {% include toc.html %}
</div>
</div>
- <div class="toc" id="toc">
- <div align="center">
- <input class="docsearch-input" type="search" placeholder="Search docs..." autocomplete="off" spellcheck="false"/>
- </div>
- {% include toc.html %}
- </div>
</div>
{% include footer.html %}
diff --git a/_sass/highlight.sass b/_sass/highlight.sass
index 88c3b17..148b972 100644
--- a/_sass/highlight.sass
+++ b/_sass/highlight.sass
@@ -26,17 +26,14 @@ $text-color: white
margin: 0
font-size: 95%
padding: .2em .4em
- border-top-left-radius: 3px
- border-top-right-radius: 3px
- border-bottom-right-radius: 3px
- border-bottom-left-radius: 3px
color: rgb(16, 16, 16)
box-shadow: rgb(230, 230, 230) 0px 0px 0px 1px inset
.highlight
border-radius: 10px
font-size: 14px
- padding: 10px 30px 10px 30px
+ padding: 10px 30px
+ margin: -2px 0px
margin-left: -30px
margin-right: -30px
diff --git a/_sass/royale-theme.sass b/_sass/royale-theme.sass
index d69deb3..5df3dd9 100644
--- a/_sass/royale-theme.sass
+++ b/_sass/royale-theme.sass
@@ -199,13 +199,22 @@
padding-right: 14px
.toc_and_doc
- display: flex
- align-items: flex-start
- justify-content: center
- flex-wrap: wrap
font-family: 'Hind Siliguri'
margin-top: 50px
+ padding-left: 20px
+ padding-right: 20px
+ margin-left: auto
+ margin-right: auto
+
+@media (min-width: 1340px)
+ .toc_and_doc
+ max-width: 1260px
+
+@media (min-width: 780px)
+ .toc_and_doc
+ width: 90%
+
.toc
display: inline-block
margin-top: 80px
@@ -227,16 +236,15 @@
transform: rotateX(180deg)
margin-bottom: 2px
-.page-content
- min-height: 670px
- margin-left: 15px
- margin-right: 15px
+.page-content
+ display: flex
+ min-height: calc(100vh - 60px)
padding-bottom: 60px
- display: inline-block
- flex-grow: 1
- max-width: 760px
- min-width: 0
- width: 760px
+ // display: inline-block
+ // flex-grow: 1
+ // max-width: 760px
+ // min-width: 0
+ // width: 760px
h1 + p
color: #4393c3
@@ -249,6 +257,10 @@
a
background-color: rgba(104, 223, 255, 0)
+@media (max-width: 599px)
+ .page-content
+ flex-direction: column
+
.menu_div2
margin-left: 15px
diff --git a/assets/css/styles.sass b/assets/css/styles.sass
index a8ab926..e05df94 100644
--- a/assets/css/styles.sass
+++ b/assets/css/styles.sass
@@ -22,6 +22,6 @@
@import "markdown"
@import "highlight"
@import "royale-theme"
-@import "sidebar"
+// import "sidebar"
@import "docsearch"