diff options
author | Mark Otto <markd.otto@gmail.com> | 2020-09-25 19:35:24 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-25 19:35:24 +0300 |
commit | 74279460c2647853d44d5b03f2965792fc243f45 (patch) | |
tree | 1bea70b348187dab3267c8126aea5034a2e646a4 /site/layouts | |
parent | ca225788484e6aa11186434595984242882af126 (diff) |
v5: Adjust docs sidebar and navbar (#31119)
* Hide the docs nav on mobile, redesign it for two columns on narrow devices
* Tweak spacing on ToC
* Redesign sidebar and subnav
* Revamp subnav mobile layout so everything's on one line
* Tighten up masthead a little
* Switch the icon for the subnav and do a little icon toggling
* Fix mobile overflow since we changed guters stuff
* Add the widths
* make the subnav icon purple
Diffstat (limited to 'site/layouts')
-rw-r--r-- | site/layouts/_default/docs.html | 12 | ||||
-rw-r--r-- | site/layouts/partials/docs-navbar.html | 95 | ||||
-rw-r--r-- | site/layouts/partials/docs-sidebar.html | 2 | ||||
-rw-r--r-- | site/layouts/partials/docs-subnav.html | 13 | ||||
-rw-r--r-- | site/layouts/partials/docs-versions.html | 6 | ||||
-rw-r--r-- | site/layouts/partials/home/masthead.html | 2 | ||||
-rw-r--r-- | site/layouts/partials/icons/collapse.svg | 4 | ||||
-rw-r--r-- | site/layouts/partials/icons/expand.svg | 4 | ||||
-rw-r--r-- | site/layouts/partials/icons/list.svg | 3 |
9 files changed, 81 insertions, 60 deletions
diff --git a/site/layouts/_default/docs.html b/site/layouts/_default/docs.html index d54e2a9fde..5a5b643661 100644 --- a/site/layouts/_default/docs.html +++ b/site/layouts/_default/docs.html @@ -9,13 +9,13 @@ {{ partial "docs-navbar" . }} {{ partial "docs-subnav" . }} - <div class="container-xxl my-4 bd-layout"> + <div class="container-xxl my-md-4 bd-layout"> <aside class="bd-sidebar"> {{ partial "docs-sidebar" . }} </aside> <main class="bd-main order-1"> - <div class="bd-intro pt-md-3 pl-lg-4"> + <div class="bd-intro pl-lg-4"> <div class="d-md-flex flex-md-row-reverse align-items-center justify-content-between"> <a class="btn btn-sm btn-bd-light mb-2 mb-md-0" href="{{ .Site.Params.repo }}/blob/main/site/content/{{ .Page.File.Path }}" title="View and edit this file on GitHub" target="_blank" rel="noopener">View on GitHub</a> <h1 class="bd-title" id="content">{{ .Title | markdownify }}</h1> @@ -25,10 +25,10 @@ </div> {{ if (eq .Page.Params.toc true) }} - <div class="bd-toc pl-xl-3 text-muted mb-lg-5"> - <strong class="d-block h6 my-2 pb-2 border-bottom">On this page</strong> - {{ .TableOfContents }} - </div> + <div class="bd-toc mt-4 mb-5 my-md-0 pl-xl-3 mb-lg-5 text-muted"> + <strong class="d-block h6 my-2 pb-2 border-bottom">On this page</strong> + {{ .TableOfContents }} + </div> {{ end }} <div class="bd-content pl-lg-4"> diff --git a/site/layouts/partials/docs-navbar.html b/site/layouts/partials/docs-navbar.html index ac0c384439..e62c050f50 100644 --- a/site/layouts/partials/docs-navbar.html +++ b/site/layouts/partials/docs-navbar.html @@ -1,58 +1,67 @@ -<header class="navbar navbar-expand navbar-dark bd-navbar"> +<header class="navbar navbar-expand-md navbar-dark bd-navbar"> <nav class="container-xxl flex-wrap flex-md-nowrap" aria-label="Main navigation"> <a class="navbar-brand p-0 mr-2" href="/" aria-label="Bootstrap"> - {{ partial "icons/bootstrap-white-fill.svg" (dict "class" "d-block" "width" "40" "height" "32") }} + {{ partial "icons/bootstrap-white-fill.svg" (dict "class" "d-block my-1" "width" "2.5rem" "height" "2rem") }} </a> - <div class="navbar-nav-scroll order-3 order-md-0 d-flex justify-content-center justify-content-md-start mt-1 mt-md-0"> - <ul class="navbar-nav bd-navbar-nav flex-row py-2 py-md-0"> - <li class="nav-item"> - <a class="nav-link{{ if .IsHome }} active" aria-current="page{{ end }}" href="/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Bootstrap');">Home</a> - </li> - <li class="nav-item"> - <a class="nav-link{{ if eq .Page.Layout "docs" }} active" aria-current="true{{ end }}" href="/docs/{{ .Site.Params.docs_version }}/getting-started/introduction/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Docs</a> + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#bdNavbar" aria-controls="bdNavbar" aria-expanded="false" aria-label="Toggle navigation"> + <svg class="bi" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> + <path fill-rule="evenodd" d="M2.5 11.5A.5.5 0 0 1 3 11h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm0-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm0-4A.5.5 0 0 1 3 3h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5z"/> + </svg> + </button> + + <div class="collapse navbar-collapse" id="bdNavbar"> + <ul class="navbar-nav flex-row flex-wrap bd-navbar-nav pt-2 py-md-0"> + <li class="nav-item col-6 col-md-auto"> + <a class="nav-link p-2{{ if .IsHome }} active" aria-current="page{{ end }}" href="/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Bootstrap');">Home</a> </li> - <li class="nav-item"> - <a class="nav-link{{ if eq .Page.Title "Examples" }} active" aria-current="true{{ end }}" href="/docs/{{ .Site.Params.docs_version }}/examples/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Examples');">Examples</a> + <li class="nav-item col-6 col-md-auto"> + <a class="nav-link p-2{{ if eq .Page.Layout "docs" }} active" aria-current="true{{ end }}" href="/docs/{{ .Site.Params.docs_version }}/getting-started/introduction/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Docs</a> </li> - <li class="nav-item"> - <a class="nav-link" href="{{ .Site.Params.icons }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Icons');" target="_blank" rel="noopener">Icons</a> + <li class="nav-item col-6 col-md-auto"> + <a class="nav-link p-2{{ if eq .Page.Title "Examples" }} active" aria-current="true{{ end }}" href="/docs/{{ .Site.Params.docs_version }}/examples/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Examples');">Examples</a> </li> - <li class="nav-item"> - <a class="nav-link" href="{{ .Site.Params.themes }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Themes');" target="_blank" rel="noopener">Themes</a> + <li class="nav-item col-6 col-md-auto"> + <a class="nav-link p-2" href="{{ .Site.Params.icons }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Icons');" target="_blank" rel="noopener">Icons</a> </li> - <li class="nav-item"> - <a class="nav-link" href="{{ .Site.Params.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');" target="_blank" rel="noopener">Expo</a> + <li class="nav-item col-6 col-md-auto"> + <a class="nav-link p-2" href="{{ .Site.Params.themes }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Themes');" target="_blank" rel="noopener">Themes</a> </li> - <li class="nav-item"> - <a class="nav-link" href="{{ .Site.Params.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');" target="_blank" rel="noopener">Blog</a> + <li class="nav-item col-6 col-md-auto"> + <a class="nav-link p-2" href="{{ .Site.Params.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');" target="_blank" rel="noopener">Blog</a> </li> </ul> - </div> - <ul class="navbar-nav ml-sm-auto"> - <li class="nav-item"> - <a class="nav-link px-1 mx-1 py-2" href="{{ .Site.Params.github_org }}" target="_blank" rel="noopener" aria-label="GitHub"> - {{ partial "icons/github.svg" (dict "class" "navbar-nav-svg d-inline-block align-text-top" "width" "36" "height" "36") }} - </a> - </li> - <li class="nav-item"> - <a class="nav-link px-1 mx-1 py-2" href="https://twitter.com/{{ .Site.Params.twitter }}" target="_blank" rel="noopener" aria-label="Twitter"> - {{ partial "icons/twitter.svg" (dict "class" "navbar-nav-svg d-inline-block align-text-top" "width" "36" "height" "36") }} - </a> - </li> - <li class="nav-item"> - <a class="nav-link px-1 mx-1 py-2" href="{{ .Site.Params.slack }}" target="_blank" rel="noopener" aria-label="Slack"> - {{ partial "icons/slack.svg" (dict "class" "navbar-nav-svg d-inline-block align-text-top" "width" "36" "height" "36") }} - </a> - </li> - <li class="nav-item"> - <a class="nav-link px-1 mx-1 py-2" href="{{ .Site.Params.opencollective }}" target="_blank" rel="noopener" aria-label="Open Collective"> - {{ partial "icons/opencollective.svg" (dict "class" "navbar-nav-svg d-inline-block align-text-top" "width" "36" "height" "36") }} - </a> - </li> - </ul> + <hr class="d-md-none text-white-50"> + + <ul class="navbar-nav flex-row flex-wrap ml-md-auto"> + <li class="nav-item col-6 col-md-auto"> + <a class="nav-link p-2" href="{{ .Site.Params.github_org }}" target="_blank" rel="noopener"> + {{ partial "icons/github.svg" (dict "class" "navbar-nav-svg d-inline-block align-text-top" "width" "36" "height" "36") }} + <small class="d-md-none ml-2">GitHub</small> + </a> + </li> + <li class="nav-item col-6 col-md-auto"> + <a class="nav-link p-2" href="https://twitter.com/{{ .Site.Params.twitter }}" target="_blank" rel="noopener"> + {{ partial "icons/twitter.svg" (dict "class" "navbar-nav-svg d-inline-block align-text-top" "width" "36" "height" "36") }} + <small class="d-md-none ml-2">Twitter</small> + </a> + </li> + <li class="nav-item col-6 col-md-auto"> + <a class="nav-link p-2" href="{{ .Site.Params.slack }}" target="_blank" rel="noopener"> + {{ partial "icons/slack.svg" (dict "class" "navbar-nav-svg d-inline-block align-text-top" "width" "36" "height" "36") }} + <small class="d-md-none ml-2">Slack</small> + </a> + </li> + <li class="nav-item col-6 col-md-auto"> + <a class="nav-link p-2" href="{{ .Site.Params.opencollective }}" target="_blank" rel="noopener"> + {{ partial "icons/opencollective.svg" (dict "class" "navbar-nav-svg d-inline-block align-text-top" "width" "36" "height" "36") }} + <small class="d-md-none ml-2">Open Collective</small> + </a> + </li> + </ul> - <a class="btn btn-bd-download d-none d-lg-inline-block mb-3 mb-md-0 ml-md-3" href="/docs/{{ .Site.Params.docs_version }}/getting-started/download/">Download</a> + <a class="btn btn-bd-download d-lg-inline-block my-2 my-md-0 ml-md-3" href="/docs/{{ .Site.Params.docs_version }}/getting-started/download/">Download</a> + </div> </nav> </header> diff --git a/site/layouts/partials/docs-sidebar.html b/site/layouts/partials/docs-sidebar.html index 8fd77361f5..776da2db12 100644 --- a/site/layouts/partials/docs-sidebar.html +++ b/site/layouts/partials/docs-sidebar.html @@ -2,7 +2,7 @@ {{- $url := split .Permalink "/" -}} {{- $page_slug := index $url (sub (len $url) 2) -}} - <ul class="list-unstyled mb-0 pt-1 pb-3"> + <ul class="list-unstyled mb-0 py-3 pt-md-1"> {{- range $group := .Site.Data.sidebar -}} {{- $link := $group.title -}} {{- $link_slug := $link | urlize -}} diff --git a/site/layouts/partials/docs-subnav.html b/site/layouts/partials/docs-subnav.html index 4929c83b10..31000ccfbe 100644 --- a/site/layouts/partials/docs-subnav.html +++ b/site/layouts/partials/docs-subnav.html @@ -1,13 +1,14 @@ -<nav class="bd-subnavbar pt-2 pb-3 pb-md-2" aria-label="Secondary navigation"> - <div class="container-xxl d-flex align-items-md-center flex-wrap"> - <form class="bd-search position-relative mb-2 mb-md-0 mr-auto"> +<nav class="bd-subnavbar py-2" aria-label="Secondary navigation"> + <div class="container-xxl d-flex align-items-md-center"> + <form class="bd-search position-relative mr-auto"> <input type="search" class="form-control" id="search-input" placeholder="Search docs..." aria-label="Search docs for..." autocomplete="off" data-docs-version="{{ .Site.Params.docs_version }}"> </form> {{ partial "docs-versions" . }} - <button class="btn bd-search-docs-toggle d-md-none p-0 ml-3 order-3 ml-auto" type="button" data-toggle="collapse" data-target="#bd-docs-nav" aria-controls="bd-docs-nav" aria-expanded="false" aria-label="Toggle docs navigation"> - {{ partial "icons/menu.svg" (dict "width" "30" "height" "30") }} - </button> + <button class="btn bd-sidebar-toggle d-md-none py-0 px-1 ml-3 order-3 collapsed" type="button" data-toggle="collapse" data-target="#bd-docs-nav" aria-controls="bd-docs-nav" aria-expanded="false" aria-label="Toggle docs navigation"> + {{ partial "icons/expand.svg" (dict "class" "bi bi-expand" "width" "1.5rem" "height" "1.5rem") }} + {{ partial "icons/collapse.svg" (dict "class" "bi bi-collapse" "width" "1.5rem" "height" "1.5rem") }} + </button> </div> </nav> diff --git a/site/layouts/partials/docs-versions.html b/site/layouts/partials/docs-versions.html index d4f58cb1dd..913314827d 100644 --- a/site/layouts/partials/docs-versions.html +++ b/site/layouts/partials/docs-versions.html @@ -1,8 +1,8 @@ -<div class="dropdown"> +<div class="dropdown ml-3"> <button class="btn btn-bd-light dropdown-toggle" id="bd-versions" data-toggle="dropdown" aria-expanded="false" data-display="static"> - Bootstrap v{{ .Site.Params.docs_version }} + <span class="d-none d-lg-inline">Bootstrap</span> v{{ .Site.Params.docs_version }} </button> - <ul class="dropdown-menu dropdown-menu-md-right" aria-labelledby="bd-versions"> + <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="bd-versions"> <li><a class="dropdown-item current" aria-current="true" href="/docs/{{ .Site.Params.docs_version }}/">Latest (5.0.x)</a></li> <li><hr class="dropdown-divider"></li> <li><a class="dropdown-item" href="https://getbootstrap.com/docs/4.5/">v4.5.0</a></li> diff --git a/site/layouts/partials/home/masthead.html b/site/layouts/partials/home/masthead.html index bdbc05cd10..4ca26104dc 100644 --- a/site/layouts/partials/home/masthead.html +++ b/site/layouts/partials/home/masthead.html @@ -1,4 +1,4 @@ -<div class="bd-masthead mb-3 mb-md-5" id="content"> +<div class="bd-masthead mb-3" id="content"> <div class="container px-4 px-md-3"> <div class="row align-items-lg-center"> <div class="col-8 mx-auto col-md-4 order-md-2 col-lg-5"> diff --git a/site/layouts/partials/icons/collapse.svg b/site/layouts/partials/icons/collapse.svg new file mode 100644 index 0000000000..83e6cc6881 --- /dev/null +++ b/site/layouts/partials/icons/collapse.svg @@ -0,0 +1,4 @@ +<svg xmlns="http://www.w3.org/2000/svg"{{ with .width }} width="{{ . }}"{{ end }}{{ with .height }} height="{{ . }}"{{ end }}{{ with .class }} class="{{ . }}"{{ end }} viewBox="0 0 16 16"> + <title>{{ with .title }}{{ . }}{{ else }}Collapse{{ end }}</title> + <path fill-rule="evenodd" d="M1 8a.5.5 0 0 1 .5-.5h13a.5.5 0 0 1 0 1h-13A.5.5 0 0 1 1 8zm7-8a.5.5 0 0 1 .5.5v3.793l1.146-1.147a.5.5 0 0 1 .708.708l-2 2a.5.5 0 0 1-.708 0l-2-2a.5.5 0 1 1 .708-.708L7.5 4.293V.5A.5.5 0 0 1 8 0zm-.5 11.707l-1.146 1.147a.5.5 0 0 1-.708-.708l2-2a.5.5 0 0 1 .708 0l2 2a.5.5 0 0 1-.708.708L8.5 11.707V15.5a.5.5 0 0 1-1 0v-3.793z"/> +</svg> diff --git a/site/layouts/partials/icons/expand.svg b/site/layouts/partials/icons/expand.svg new file mode 100644 index 0000000000..dfd83e9618 --- /dev/null +++ b/site/layouts/partials/icons/expand.svg @@ -0,0 +1,4 @@ +<svg xmlns="http://www.w3.org/2000/svg"{{ with .width }} width="{{ . }}"{{ end }}{{ with .height }} height="{{ . }}"{{ end }}{{ with .class }} class="{{ . }}"{{ end }} viewBox="0 0 16 16"> + <title>{{ with .title }}{{ . }}{{ else }}Expand{{ end }}</title> + <path fill-rule="evenodd" d="M1 8a.5.5 0 0 1 .5-.5h13a.5.5 0 0 1 0 1h-13A.5.5 0 0 1 1 8zM7.646.146a.5.5 0 0 1 .708 0l2 2a.5.5 0 0 1-.708.708L8.5 1.707V5.5a.5.5 0 0 1-1 0V1.707L6.354 2.854a.5.5 0 1 1-.708-.708l2-2zM8 10a.5.5 0 0 1 .5.5v3.793l1.146-1.147a.5.5 0 0 1 .708.708l-2 2a.5.5 0 0 1-.708 0l-2-2a.5.5 0 0 1 .708-.708L7.5 14.293V10.5A.5.5 0 0 1 8 10z"/> +</svg> diff --git a/site/layouts/partials/icons/list.svg b/site/layouts/partials/icons/list.svg new file mode 100644 index 0000000000..65efa431b6 --- /dev/null +++ b/site/layouts/partials/icons/list.svg @@ -0,0 +1,3 @@ +<svg{{ with .width }} width="{{ . }}"{{ end }}{{ with .height }} height="{{ . }}"{{ end }}{{ with .class }} class="{{ . }}"{{ end }} viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> + <path fill-rule="evenodd" d="M2.5 11.5A.5.5 0 0 1 3 11h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm0-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm0-4A.5.5 0 0 1 3 3h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5z"/> +</svg>
\ No newline at end of file |