From 5b4dec6db91cfc28c51756101c2f7f2747d884d3 Mon Sep 17 00:00:00 2001 From: Alex Shpak Date: Mon, 8 Oct 2018 20:56:06 +0200 Subject: [PATCH] Fix menu paddings, add additional space for big screens --- assets/_markdown.scss | 3 +- assets/book.scss | 41 +++++++++++++++++------- exampleSite/.gitignore | 1 + exampleSite/config.yml | 4 ++- layouts/partials/docs/menu-filetree.html | 2 +- 5 files changed, 37 insertions(+), 14 deletions(-) create mode 100644 exampleSite/.gitignore diff --git a/assets/_markdown.scss b/assets/_markdown.scss index 78505d2..b0f7116 100644 --- a/assets/_markdown.scss +++ b/assets/_markdown.scss @@ -5,8 +5,9 @@ $block-border-radius: 0.15rem; .markdown { line-height: 1.7; - :first-child { + > :first-child { margin-top: 0; + line-height: 1em; } h1, h2, h3, h4, h5 { diff --git a/assets/book.scss b/assets/book.scss index 948d8f9..583ecc2 100644 --- a/assets/book.scss +++ b/assets/book.scss @@ -36,14 +36,20 @@ a { } } +img { + vertical-align: middle; +} + aside { ul { margin: 0; padding-left: $padding-16; list-style: none; - line-height: 2em; + line-height: 1.5em; li { + margin: .5em 0; + a { display: block; } a:hover { opacity: .5; } @@ -66,6 +72,15 @@ aside.fixed nav { overflow: hidden auto; } +header { + display: flex; + align-items:center; + justify-content: space-between; + margin-bottom: $padding-16; + + display: none; +} + main { max-width: $content-max-width; margin: 0 auto; @@ -96,22 +111,13 @@ main { a { color: $nav-link-color; } a.active { color: $color-link; } - .flat { + .flat-section { margin-bottom: $padding-16; > a { font-weight: 700; } > ul { padding-left: 0; } } } - header { - display: flex; - align-items:center; - justify-content: space-between; - margin-bottom: $padding-16; - - display: none; - } - .content { flex: 1 0; width: 0; @@ -167,3 +173,16 @@ $toc-hide-point: $menu-hide-point + $nav-menu-width; } } } + +// Extra space for big screens +@media screen and (min-width: $toc-hide-point) { + main { + .content { + padding: $padding-16 * 2 $padding-16; + } + + .menu nav, .toc nav { + padding: $padding-16 * 2; + } + } +} \ No newline at end of file diff --git a/exampleSite/.gitignore b/exampleSite/.gitignore new file mode 100644 index 0000000..07cf801 --- /dev/null +++ b/exampleSite/.gitignore @@ -0,0 +1 @@ +resources/ \ No newline at end of file diff --git a/exampleSite/config.yml b/exampleSite/config.yml index 378f01f..2c49a8c 100644 --- a/exampleSite/config.yml +++ b/exampleSite/config.yml @@ -1,6 +1,8 @@ +# hugo server --themesDir ... + baseURL: http://example.org title: Rx Jersey -theme: book +theme: hugo-book # Book configuration disablePathToLower: true diff --git a/layouts/partials/docs/menu-filetree.html b/layouts/partials/docs/menu-filetree.html index 5c1f11b..8530656 100644 --- a/layouts/partials/docs/menu-filetree.html +++ b/layouts/partials/docs/menu-filetree.html @@ -8,7 +8,7 @@ {{ define "book-section" }}