From 44ad3051c99ee866e4f11175bf3ee588bc5408ca Mon Sep 17 00:00:00 2001 From: Dora Fraeman Caswell Date: Tue, 22 Oct 2019 23:48:41 -0400 Subject: [PATCH 1/4] DOC: adding main nav to site Added a main nav to sperate nav links from breadcrumb links This should make navigating matplotlib.org easier --- doc/_static/mpl.css | 25 +++++++++++++++++++++++++ doc/_templates/layout.html | 14 ++++++++++---- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css index c844558099ef..06e47314b403 100644 --- a/doc/_static/mpl.css +++ b/doc/_static/mpl.css @@ -1118,3 +1118,28 @@ div.viewcode-block:target { .sidebar-announcement p { margin: 0.4em 0.4em 0.6em 0.4em; } + +/* new main nav */ +nav.main-nav{ + background-color: #002b47; + font-family: Calibri, 'Gill Sans', 'Gill Sans MT', 'Trebuchet MS', sans-serif; + text-transform: uppercase; + letter-spacing: 2px; + font-size: 11px; + } + + nav.main-nav ul{ + margin: 0; + padding: 0; + display: flex; + flex-direction: row; + } + + nav.main-nav li{ + margin: 8px 15px; + list-style-type: none; + } + + nav.main-nav a{ + color: white; + } diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html index 6ae6b21be7cc..2601a55695d3 100644 --- a/doc/_templates/layout.html +++ b/doc/_templates/layout.html @@ -1,10 +1,6 @@ {% extends "!layout.html" %} {%- block rootrellink %} -
  • home| 
    • -
  • examples| 
    • -
  • tutorials| 
    • -
  • API| 
  • contents »
    • {%- endblock %} @@ -45,6 +41,16 @@
    Fork me on GitHub
    + + {%- endblock %} {%- block sidebar1 %}{{ sidebar() }}{% endblock %} From c6e7b08991572c54ea4e4cbf3001ac6153cf0884 Mon Sep 17 00:00:00 2001 From: Dora Fraeman Caswell Date: Wed, 23 Oct 2019 23:13:48 -0400 Subject: [PATCH 2/4] added hover links, larger font size, Carlito to font stack --- doc/_static/mpl.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css index 06e47314b403..a53ce55d52ed 100644 --- a/doc/_static/mpl.css +++ b/doc/_static/mpl.css @@ -1122,10 +1122,10 @@ div.viewcode-block:target { /* new main nav */ nav.main-nav{ background-color: #002b47; - font-family: Calibri, 'Gill Sans', 'Gill Sans MT', 'Trebuchet MS', sans-serif; + font-family: Calibri, 'Carlito', 'Gill Sans', 'Gill Sans MT', 'Trebuchet MS', sans-serif; text-transform: uppercase; letter-spacing: 2px; - font-size: 11px; + font-size: 12px; } nav.main-nav ul{ @@ -1141,5 +1141,11 @@ nav.main-nav{ } nav.main-nav a{ + color: rgba(256, 256, 256, .8); + transform: color .2s ease-in-out; + } + + nav.main-nav a:hover{ color: white; + text-decoration: underline; } From bfae26088ca5efa97f7d1318aa7f30f7f988d0a1 Mon Sep 17 00:00:00 2001 From: Dora Fraeman Caswell Date: Wed, 23 Oct 2019 23:14:43 -0400 Subject: [PATCH 3/4] re-added home link to bread crumb --- doc/_templates/layout.html | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html index 2601a55695d3..ecfe912d9d8a 100644 --- a/doc/_templates/layout.html +++ b/doc/_templates/layout.html @@ -1,6 +1,7 @@ {% extends "!layout.html" %} {%- block rootrellink %} +
  • home| 
  • contents »
    • {%- endblock %} From 396207da3651c9213232bce6a128f84d45001d88 Mon Sep 17 00:00:00 2001 From: Dora Fraeman Caswell Date: Thu, 24 Oct 2019 10:24:34 -0400 Subject: [PATCH 4/4] updated nav order --- doc/_templates/layout.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html index ecfe912d9d8a..f30a5c758b06 100644 --- a/doc/_templates/layout.html +++ b/doc/_templates/layout.html @@ -45,11 +45,11 @@ {%- endblock %}