diff --git a/scss/_reboot.scss b/scss/_reboot.scss index 6ff66a022681..263829586c5e 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -157,7 +157,6 @@ address { ol, ul { - padding-right: 2rem; padding-left: 2rem; } diff --git a/site/content/docs/4.3/components/alerts.md b/site/content/docs/4.3/components/alerts.md index be1bf150404b..2f00b3759327 100644 --- a/site/content/docs/4.3/components/alerts.md +++ b/site/content/docs/4.3/components/alerts.md @@ -107,7 +107,7 @@ var bsAlert = new bootstrap.Alert(myAlert) This makes an alert listen for click events on descendant elements which have the `data-dismiss="alert"` attribute. (Not necessary when using the data-api's auto-initialization.) - +
@@ -152,7 +152,7 @@ alert.close() Bootstrap's alert plugin exposes a few events for hooking into alert functionality. -
Method
+
diff --git a/site/content/docs/4.3/components/buttons.md b/site/content/docs/4.3/components/buttons.md index 1839622e3792..991dec7457dd 100644 --- a/site/content/docs/4.3/components/buttons.md +++ b/site/content/docs/4.3/components/buttons.md @@ -159,7 +159,7 @@ var button = document.getElementById('myButton') var bsButton = new bootstrap.Button(button) {{< /highlight >}} -
Event
+
diff --git a/site/content/docs/4.3/components/dropdowns.md b/site/content/docs/4.3/components/dropdowns.md index 3669f4d1c3e1..8f4e914c719c 100644 --- a/site/content/docs/4.3/components/dropdowns.md +++ b/site/content/docs/4.3/components/dropdowns.md @@ -862,7 +862,7 @@ Note when `boundary` is set to any value other than `'scrollParent'`, the style ### Methods -
Method
+
@@ -914,7 +914,7 @@ Note when `boundary` is set to any value other than `'scrollParent'`, the style All dropdown events are fired at the `.dropdown-menu`'s parent element and have a `relatedTarget` property, whose value is the toggling anchor element. `hide.bs.dropdown` and `hidden.bs.dropdown` events have a `clickEvent` property (only when the original Event type is `click`) that contains an Event Object for the click event. -
Method
+
diff --git a/site/content/docs/4.3/content/reboot.md b/site/content/docs/4.3/content/reboot.md index fd7dcbd1eadb..7180992ae3e1 100644 --- a/site/content/docs/4.3/content/reboot.md +++ b/site/content/docs/4.3/content/reboot.md @@ -53,7 +53,7 @@ This `font-family` is applied to the `` and automatically inherited global All heading elements—e.g., `

`—and `

` are reset to have their `margin-top` removed. Headings have `margin-bottom: .5rem` added and paragraphs `margin-bottom: 1rem` for easy spacing. -

Method
+
@@ -102,7 +102,7 @@ All heading elements—e.g., `

`—and `

` are reset to have their `margin- ## Lists -All lists—`

Heading
+
diff --git a/site/content/docs/4.3/migration.md b/site/content/docs/4.3/migration.md index c0a3cbe1b7d5..bae7c6a5167f 100644 --- a/site/content/docs/4.3/migration.md +++ b/site/content/docs/4.3/migration.md @@ -53,7 +53,8 @@ Changes to any layout tools and our grid system. Changes to Reboot, typography, tables, and more. - **Todo:** Make RFS enabled by default -- Reset default horizontal `padding` on `
Heading
+
diff --git a/site/layouts/_default/docs.html b/site/layouts/_default/docs.html index 9bde5246ac8d..fff946d10728 100644 --- a/site/layouts/_default/docs.html +++ b/site/layouts/_default/docs.html @@ -7,24 +7,9 @@ {{ partial "skippy" . }} {{ partial "docs-navbar" . }} + {{ partial "docs-subnav" . }} - - -
+
{{ partial "docs-sidebar" . }} diff --git a/site/layouts/_default/single.html b/site/layouts/_default/single.html index b8caae6dd836..09631ac19e91 100644 --- a/site/layouts/_default/single.html +++ b/site/layouts/_default/single.html @@ -8,21 +8,6 @@ {{ partial "docs-navbar" . }} - -

{{ .Title | markdownify }}

diff --git a/site/layouts/partials/docs-navbar.html b/site/layouts/partials/docs-navbar.html index ced87b9955ba..a8f8b17a1e9c 100644 --- a/site/layouts/partials/docs-navbar.html +++ b/site/layouts/partials/docs-navbar.html @@ -1,10 +1,10 @@ -
-
+
+
{{ partial "icons/bootstrap-logo-solid.svg" (dict "class" "d-block" "width" "32" "height" "32") }} -
+
  • Home @@ -27,7 +27,7 @@
-
    +
    • {{ partial "icons/github.svg" (dict "class" "navbar-nav-svg" "width" "36" "height" "36") }} diff --git a/site/layouts/partials/docs-sidebar.html b/site/layouts/partials/docs-sidebar.html index d661bf725bce..94b73094de40 100644 --- a/site/layouts/partials/docs-sidebar.html +++ b/site/layouts/partials/docs-sidebar.html @@ -21,7 +21,7 @@ {{- if $group.pages }} -
        +
          {{- range $doc := $group.pages -}} {{- $doc_slug := $doc.title | urlize }} diff --git a/site/layouts/partials/docs-subnav.html b/site/layouts/partials/docs-subnav.html new file mode 100644 index 000000000000..61dd5282d16d --- /dev/null +++ b/site/layouts/partials/docs-subnav.html @@ -0,0 +1,23 @@ + diff --git a/site/static/docs/4.3/assets/scss/_nav.scss b/site/static/docs/4.3/assets/scss/_nav.scss index 4f1f61f1b19c..3ceec7aebc52 100644 --- a/site/static/docs/4.3/assets/scss/_nav.scss +++ b/site/static/docs/4.3/assets/scss/_nav.scss @@ -30,11 +30,30 @@ } } +.bd-search { + position: relative; // To contain the Algolia search + + @include media-breakpoint-down(sm) { + width: 100%; + } + + .form-control:focus { + border-color: $bd-purple-bright; + box-shadow: 0 0 0 3px rgba($bd-purple-bright, .25); + } +} + +.bd-search-docs-toggle { + line-height: 1; + color: $gray-900; +} + .link-dark { font-weight: 500; color: $dark; - &:hover { + &:hover, + &:focus { color: $blue; text-decoration: none; } @@ -45,11 +64,8 @@ background-color: $bd-purple-bright; @include media-breakpoint-down(md) { - padding-right: .5rem; - padding-left: .5rem; - .navbar-nav-scroll { - max-width: 100%; + width: 100%; height: 2.5rem; margin-top: .25rem; overflow: hidden; @@ -70,7 +86,8 @@ color: $bd-purple-light; &.active, - &:hover { + &:hover, + &:focus { color: $white; background-color: transparent; } diff --git a/site/static/docs/4.3/assets/scss/_sidebar.scss b/site/static/docs/4.3/assets/scss/_sidebar.scss index 43232e9aa414..be7c9d50cd25 100644 --- a/site/static/docs/4.3/assets/scss/_sidebar.scss +++ b/site/static/docs/4.3/assets/scss/_sidebar.scss @@ -19,20 +19,6 @@ } } -.bd-search { - position: relative; // To contain the Algolia search - - .form-control:focus { - border-color: $bd-purple-bright; - box-shadow: 0 0 0 3px rgba($bd-purple-bright, .25); - } -} - -.bd-search-docs-toggle { - line-height: 1; - color: $gray-900; -} - .bd-sidenav { display: none; } @@ -45,7 +31,8 @@ > * { pointer-events: none; } - &:hover { + &:hover, + &:focus { color: rgba(0, 0, 0, .85); text-decoration: none; background-color: rgba($bd-purple-bright, .1); @@ -91,7 +78,8 @@ color: rgba(0, 0, 0, .65); @include border-radius(.25rem); - &:hover { + &:hover, + &:focus { color: rgba(0, 0, 0, .85); text-decoration: none; background-color: rgba($bd-purple-bright, .1); @@ -99,7 +87,8 @@ } > .active > a, - > .active:hover > a { + > .active:hover > a, + > .active:focus > a { font-weight: 600; color: rgba(0, 0, 0, .85); }
Screen size