From e44b30e26653e5c2623aa4c707be3f9635bc0181 Mon Sep 17 00:00:00 2001 From: Raphael Gauthier Date: Tue, 21 Aug 2018 14:38:15 +0200 Subject: [PATCH] Work in progress --- rudder-theme/src/css/custom.css | 48 +++++++++++++++++++++-------- src/reference/tools/generate-nav.py | 10 ++++-- 2 files changed, 43 insertions(+), 15 deletions(-) diff --git a/rudder-theme/src/css/custom.css b/rudder-theme/src/css/custom.css index bfb5e815..78d39085 100644 --- a/rudder-theme/src/css/custom.css +++ b/rudder-theme/src/css/custom.css @@ -76,6 +76,8 @@ html { color: #fff; min-height: 36px; opacity: 0.5; + position: absolute; + right: 0; } .navigation .nav-menu > ul > li ul li.nav-item.is-active > button { @@ -95,9 +97,19 @@ html { margin-left: 0; } +/* +.navigation .nav-menu ul > li.nav-item.is-current-page.is-active > ul > li { + background-color: #303d43; +} +*/ + +.navigation .nav-menu > ul > li > ul > li > ul > li { + background-color: #303d43; +} + .navigation .nav-menu > ul > li > ul li button + a { width: calc(100% - 35px) !important; - padding-left: 0 !important; + padding-left: 6px !important; } .navigation .nav-menu > h3 > a, @@ -109,6 +121,7 @@ html { .navigation .nav-menu > ul > li > ul > li.is-current-path, .navigation .nav-menu > ul > li > ul > li.is-current-page { border-left-color: #f08004; + background-color: #20272a; } .navigation .nav-menu > ul > li > ul > li.is-current-page > a { @@ -119,32 +132,42 @@ html { .navigation .nav-menu > ul > li > ul > li > a:hover, .navigation .nav-menu > ul > li > ul li button:hover { color: #fff; - background-color: #1e282c; + background-color: #1a2226; } .navigation .nav-menu > ul > li > ul li button:hover { opacity: 1; } -.navigation .nav-menu > ul > li > ul > li > ul { +.navigation .nav-menu > ul.nav-list { + color: #8aa4af; +} + +.navigation .nav-menu ul.nav-list { margin-left: 0; padding-left: 0; - color: #8aa4af; - background-color: #2c3b41; + margin-bottom: 0 !important; +} + +.navigation .nav-menu li.nav-item { + margin-top: 0; } .navigation .nav-menu > ul > li > ul > li > button + a, .navigation .nav-menu > ul > li > ul > li > ul > li > a, -.navigation .nav-menu > ul > li > ul > li > ul > li > ul li a { +.navigation .nav-menu > ul > li > ul > li > ul > li > ul li a, +.navigation .nav-menu > ul li > span.nav-text { padding: 6px 6px 6px 35px; display: block; margin: 0; width: 100%; position: relative; + min-height: 36px; } .navigation .nav-menu > ul > li > ul > li > ul > li.is-current-page > a, -.navigation .nav-menu > ul > li > ul > li > ul > li ul li.is-current-page > a { +.navigation .nav-menu > ul > li > ul > li > ul > li ul li.is-current-page > a, +.navigation .nav-menu > ul li > span.nav-text:hover { color: #fff; } @@ -168,19 +191,18 @@ html { left: 0; } -.navigation .nav-menu > ul > li > ul > li.is-current-page > button + a::before, -.navigation .nav-menu > ul > li > ul > li ul li.is-current-page > button + a::before { +.navigation .nav-menu > ul > li > ul li.is-current-page > button + a::before, +.navigation .nav-menu > ul > li > ul li.is-current-page > button + a::after { content: initial !important; } -.navigation .nav-menu > ul > li > ul > li.is-current-page > button + a, -.navigation .nav-menu > ul > li > ul > li ul li.is-current-page > button + a { - padding-right: 35px; +.navigation .nav-menu > ul > li > ul > li.is-current-page.is-active { + background-color: #1e282c; } .navigation .nav-menu > ul > li > ul > li.is-current-page > button + a::after, .navigation .nav-menu > ul > li > ul > li ul li.is-current-page > button + a::after { - right: 0; + left: 0; } .navigation .nav-menu > ul > li > ul > li > ul li a:hover { diff --git a/src/reference/tools/generate-nav.py b/src/reference/tools/generate-nav.py index cb815b0c..48f97697 100755 --- a/src/reference/tools/generate-nav.py +++ b/src/reference/tools/generate-nav.py @@ -41,17 +41,23 @@ def slugify(s): content = f.read().splitlines() prev = "" + first = True for line in content: search_title = TITLE.search(line) if search_title: - level = search_title.group(1).count("=") + level = search_title.group(1).count("=") + 1 title = search_title.group(2) search_id = ID.search(prev) if search_id: page_id = search_id.group(1) else: page_id = slugify(title) - result.append("*" * level + " xref:" + file + "#" + page_id + "[" + title + "]") + if level < 6: + if first: + result.append("*" * level + " xref:" + file + "[" + title + "]") + first = False + else: + result.append("*" * level + " xref:" + file + "#" + page_id + "[" + title + "]") prev = line print("\n".join(result))