From 7ff264ce76552ce83710d593969885a9a970dffc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 12 Oct 2018 21:57:53 +0200 Subject: [PATCH] css: make it possible to have a main/subsite link in the navbar. --- css/m-dark+doxygen.compiled.css | 19 +++-- css/m-dark.compiled.css | 19 +++-- css/m-layout.css | 19 +++-- css/m-light+doxygen.compiled.css | 19 +++-- css/m-light.compiled.css | 19 +++-- doc/css/page-layout-test-navbar-subsite.html | 76 ++++++++++++++++++++ doc/css/page-layout.rst | 28 ++++++++ 7 files changed, 174 insertions(+), 25 deletions(-) create mode 100644 doc/css/page-layout-test-navbar-subsite.html diff --git a/css/m-dark+doxygen.compiled.css b/css/m-dark+doxygen.compiled.css index 7a09c843..c949230d 100644 --- a/css/m-dark+doxygen.compiled.css +++ b/css/m-dark+doxygen.compiled.css @@ -1622,10 +1622,10 @@ body> header > nav.m-navbar-cover:target { background-color: #22272e; opacity: 1; } -body > header > nav.m-navbar-landing a#m-navbar-brand.m-navbar-brand-hidden { +body > header > nav.m-navbar-landing #m-navbar-brand.m-navbar-brand-hidden { visibility: hidden; } -body > header > nav.m-navbar-landing:target a#m-navbar-brand.m-navbar-brand-hidden { +body > header > nav.m-navbar-landing:target #m-navbar-brand.m-navbar-brand-hidden { visibility: visible; } body > header > nav { @@ -1641,16 +1641,25 @@ body > header > nav a { line-height: 2.75rem; color: #ffffff; } -body > header > nav a#m-navbar-brand, body > header > nav a#m-navbar-show, body > header > nav a#m-navbar-hide { - text-transform: uppercase; +body > header > nav #m-navbar-brand, body > header > nav a#m-navbar-show, body > header > nav a#m-navbar-hide { font-weight: 600; font-size: 1.125rem; padding-left: 1rem; padding-right: 1rem; } -body > header > nav a#m-navbar-brand .m-thin { +body > header > nav a#m-navbar-brand, body > header > nav #m-navbar-brand a { + text-transform: uppercase; +} +body > header > nav #m-navbar-brand a { + padding-left: 0; + padding-right: 0; +} +body > header > nav #m-navbar-brand .m-thin { font-weight: normal; } +body > header > nav #m-navbar-brand .m-breadcrumb { + color: #747474; +} body > header > nav a#m-navbar-show:before, body > header > nav a#m-navbar-hide:before { content:'\2630'; } diff --git a/css/m-dark.compiled.css b/css/m-dark.compiled.css index fd1a7c0a..4a296936 100644 --- a/css/m-dark.compiled.css +++ b/css/m-dark.compiled.css @@ -1622,10 +1622,10 @@ body> header > nav.m-navbar-cover:target { background-color: #22272e; opacity: 1; } -body > header > nav.m-navbar-landing a#m-navbar-brand.m-navbar-brand-hidden { +body > header > nav.m-navbar-landing #m-navbar-brand.m-navbar-brand-hidden { visibility: hidden; } -body > header > nav.m-navbar-landing:target a#m-navbar-brand.m-navbar-brand-hidden { +body > header > nav.m-navbar-landing:target #m-navbar-brand.m-navbar-brand-hidden { visibility: visible; } body > header > nav { @@ -1641,16 +1641,25 @@ body > header > nav a { line-height: 2.75rem; color: #ffffff; } -body > header > nav a#m-navbar-brand, body > header > nav a#m-navbar-show, body > header > nav a#m-navbar-hide { - text-transform: uppercase; +body > header > nav #m-navbar-brand, body > header > nav a#m-navbar-show, body > header > nav a#m-navbar-hide { font-weight: 600; font-size: 1.125rem; padding-left: 1rem; padding-right: 1rem; } -body > header > nav a#m-navbar-brand .m-thin { +body > header > nav a#m-navbar-brand, body > header > nav #m-navbar-brand a { + text-transform: uppercase; +} +body > header > nav #m-navbar-brand a { + padding-left: 0; + padding-right: 0; +} +body > header > nav #m-navbar-brand .m-thin { font-weight: normal; } +body > header > nav #m-navbar-brand .m-breadcrumb { + color: #747474; +} body > header > nav a#m-navbar-show:before, body > header > nav a#m-navbar-hide:before { content:'\2630'; } diff --git a/css/m-layout.css b/css/m-layout.css index 29b98a1c..9d10f769 100644 --- a/css/m-layout.css +++ b/css/m-layout.css @@ -50,10 +50,10 @@ body> header > nav.m-navbar-cover:target { background-color: var(--header-background-color); opacity: 1; } -body > header > nav.m-navbar-landing a#m-navbar-brand.m-navbar-brand-hidden { +body > header > nav.m-navbar-landing #m-navbar-brand.m-navbar-brand-hidden { visibility: hidden; } -body > header > nav.m-navbar-landing:target a#m-navbar-brand.m-navbar-brand-hidden { +body > header > nav.m-navbar-landing:target #m-navbar-brand.m-navbar-brand-hidden { visibility: visible; } body > header > nav { @@ -69,16 +69,25 @@ body > header > nav a { line-height: 2.75rem; color: var(--header-link-color); } -body > header > nav a#m-navbar-brand, body > header > nav a#m-navbar-show, body > header > nav a#m-navbar-hide { - text-transform: var(--nav-brand-case); +body > header > nav #m-navbar-brand, body > header > nav a#m-navbar-show, body > header > nav a#m-navbar-hide { font-weight: var(--heading-font-weight); font-size: 1.125rem; padding-left: 1rem; padding-right: 1rem; } -body > header > nav a#m-navbar-brand .m-thin { +body > header > nav a#m-navbar-brand, body > header > nav #m-navbar-brand a { + text-transform: var(--nav-brand-case); +} +body > header > nav #m-navbar-brand a { + padding-left: 0; + padding-right: 0; +} +body > header > nav #m-navbar-brand .m-thin { font-weight: normal; } +body > header > nav #m-navbar-brand .m-breadcrumb { + color: var(--dim-color); +} body > header > nav a#m-navbar-show:before, body > header > nav a#m-navbar-hide:before { content:'\2630'; } diff --git a/css/m-light+doxygen.compiled.css b/css/m-light+doxygen.compiled.css index e1dd3c21..879cb38c 100644 --- a/css/m-light+doxygen.compiled.css +++ b/css/m-light+doxygen.compiled.css @@ -1622,10 +1622,10 @@ body> header > nav.m-navbar-cover:target { background-color: #ffffff; opacity: 1; } -body > header > nav.m-navbar-landing a#m-navbar-brand.m-navbar-brand-hidden { +body > header > nav.m-navbar-landing #m-navbar-brand.m-navbar-brand-hidden { visibility: hidden; } -body > header > nav.m-navbar-landing:target a#m-navbar-brand.m-navbar-brand-hidden { +body > header > nav.m-navbar-landing:target #m-navbar-brand.m-navbar-brand-hidden { visibility: visible; } body > header > nav { @@ -1641,16 +1641,25 @@ body > header > nav a { line-height: 2.75rem; color: #000000; } -body > header > nav a#m-navbar-brand, body > header > nav a#m-navbar-show, body > header > nav a#m-navbar-hide { - text-transform: lowercase; +body > header > nav #m-navbar-brand, body > header > nav a#m-navbar-show, body > header > nav a#m-navbar-hide { font-weight: normal; font-size: 1.125rem; padding-left: 1rem; padding-right: 1rem; } -body > header > nav a#m-navbar-brand .m-thin { +body > header > nav a#m-navbar-brand, body > header > nav #m-navbar-brand a { + text-transform: lowercase; +} +body > header > nav #m-navbar-brand a { + padding-left: 0; + padding-right: 0; +} +body > header > nav #m-navbar-brand .m-thin { font-weight: normal; } +body > header > nav #m-navbar-brand .m-breadcrumb { + color: #bdbdbd; +} body > header > nav a#m-navbar-show:before, body > header > nav a#m-navbar-hide:before { content:'\2630'; } diff --git a/css/m-light.compiled.css b/css/m-light.compiled.css index e04079b1..d8e6d417 100644 --- a/css/m-light.compiled.css +++ b/css/m-light.compiled.css @@ -1622,10 +1622,10 @@ body> header > nav.m-navbar-cover:target { background-color: #ffffff; opacity: 1; } -body > header > nav.m-navbar-landing a#m-navbar-brand.m-navbar-brand-hidden { +body > header > nav.m-navbar-landing #m-navbar-brand.m-navbar-brand-hidden { visibility: hidden; } -body > header > nav.m-navbar-landing:target a#m-navbar-brand.m-navbar-brand-hidden { +body > header > nav.m-navbar-landing:target #m-navbar-brand.m-navbar-brand-hidden { visibility: visible; } body > header > nav { @@ -1641,16 +1641,25 @@ body > header > nav a { line-height: 2.75rem; color: #000000; } -body > header > nav a#m-navbar-brand, body > header > nav a#m-navbar-show, body > header > nav a#m-navbar-hide { - text-transform: lowercase; +body > header > nav #m-navbar-brand, body > header > nav a#m-navbar-show, body > header > nav a#m-navbar-hide { font-weight: normal; font-size: 1.125rem; padding-left: 1rem; padding-right: 1rem; } -body > header > nav a#m-navbar-brand .m-thin { +body > header > nav a#m-navbar-brand, body > header > nav #m-navbar-brand a { + text-transform: lowercase; +} +body > header > nav #m-navbar-brand a { + padding-left: 0; + padding-right: 0; +} +body > header > nav #m-navbar-brand .m-thin { font-weight: normal; } +body > header > nav #m-navbar-brand .m-breadcrumb { + color: #bdbdbd; +} body > header > nav a#m-navbar-show:before, body > header > nav a#m-navbar-hide:before { content:'\2630'; } diff --git a/doc/css/page-layout-test-navbar-subsite.html b/doc/css/page-layout-test-navbar-subsite.html new file mode 100644 index 00000000..5af7a27b --- /dev/null +++ b/doc/css/page-layout-test-navbar-subsite.html @@ -0,0 +1,76 @@ + + + + + Page Layout Test: navbar for a subsite + + + + + +
+
+
+
+
+
+

+ + CSS » + Page layout » + + Test: navbar for a subsite +

+

Shows how a navbar with a link to both the top-level site and the subsite +mainpage looks. See the brand link on top left. +Go back.

+
+
+ + diff --git a/doc/css/page-layout.rst b/doc/css/page-layout.rst index b4d5905f..531f78c3 100644 --- a/doc/css/page-layout.rst +++ b/doc/css/page-layout.rst @@ -249,6 +249,34 @@ items and sub-menus. Doesn't do anything on the :css:`#m-navbar-brand` element. page source to see how it's done here. Don't forget to try to shrink your browser window to see its behavior in various cases. +`Link back to main site from a subsite`_ +---------------------------------------- + +If you have a subsite with independent top navbar (for example a main site and +a forum or documentation subsite), you may want to prominently show its +relation to the main site and link back to the main site as well as the subsite +homepage. The markup looks like in the following snippet (note the +:css:`#m-navbar-brand` is now a span containing two links and a "breadcrumb" +separator), `see here how it looks <{filename}/css/page-layout-test-navbar-subsite.html>`_. + +.. code:: html + :hl_lines: 4 5 6 7 8 + :class: m-inverted + +