Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
3feaf6ca
Unverified
Commit
3feaf6ca
authored
2 years ago
by
Mark Otto
Committed by
GitHub
2 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Move DocSearch out of offcanvas to always show it on mobile (#36824)
parent
dfae8928
main
cleanup-floating-forms
dependabot/npm_and_yarn/stylelint-and-stylelint-config-twbs-bootstrap-15.3.0
fod-main-banner
github/fork/ChellyAhmed/fix-typo-reboot.md
github/fork/ChellyAhmed/offcanvas-scroll-back
github/fork/Elysiome/offcanvas-optional-window-resizing
github/fork/LunicLynx/support-different-line-height-for-buttons
github/fork/Psixodelik/main
github/fork/Ronid1/ronid1/offcanvas_static_backdrop
github/fork/RyanBerliner/tooltip-accessibility
github/fork/SantiagoPVazquez/Feature-default-border-bottom-to-dropdown-item
github/fork/Sir-Genius/utils
github/fork/Sumit-Singh-8/main
github/fork/alpadev/alpadev/call-dispose-on-component-reinstantiation
github/fork/astagi/fix/tree-shake-modules
github/fork/compnerd/dark-accordion-icon
github/fork/dev-ph1l/main
github/fork/gregorw/main
github/fork/jdelStrother/patch-1
github/fork/jonnysp/form-floating
github/fork/jonnysp/independent-offcanvas
github/fork/jonnysp/theme-dark-on-card-and-modal-fix
github/fork/josefdlange/floating-label-placeholder-opacity
github/fork/julien-deramond/main-jd-fix-offset-content
github/fork/kyletsang/fix-tooltip-padding
github/fork/lekoala/patch-3
github/fork/louismaximepiton/main-kld-lmp-collapse-proposal
github/fork/louismaximepiton/main-lmp-card-inner-border-radius-fix
github/fork/louismaximepiton/main-lmp-carousel-multiple-images
github/fork/louismaximepiton/main-lmp-css-var-init
github/fork/louismaximepiton/main-lmp-disabled-floating-label-fix
github/fork/louismaximepiton/main-lmp-input-range-fix
github/fork/louismaximepiton/main-lmp-shift-color
github/fork/louismaximepiton/main-lmp-table-active-tr-fix
github/fork/maciek-szn/switch
github/fork/nkdas91/accordion
github/fork/nstungcom/fix-missing-modal-open-class
github/fork/oraliahdz/animation-utilities
github/fork/pine3ree/patch-7
github/fork/tgm-git/patch-1
gs-forms
gs-toasts-with-animated-progress-bar
gs/change-version-dir-on-docs
gs/data-must-set-onlu-one-instance
gs/docs/fix-drop-down-error
gs/popover-fix-doc
gs/support-drop-down-in-navbar
gs/try-web-components
gs/use-event-handler-in-cocmponent
gs/use-rollup-replace-for-version
jo-docs-thanks-page
main-fod-simpler-table-structure
main-jd-abbr-title
main-jd-add-chips
main-jd-add-doc-for-sass-custom-colors
main-jd-add-enable-host-to-handle-web-components
main-jd-browserstack-fine-tune
main-jd-browserstack-updates
main-jd-docs-consistent-usage-of-css-sections-step-2
main-jd-fix-docs-headers-in-white
main-jd-fix-highlight-docs-border-radius
main-jd-fix-placeholder-color-background-params-for-img-markup
main-jd-glossary-experiment
main-jd-proto-doc-astro
main-jd-skip-navigation-component
main-jd-stackblitz-for-examples
main-jd-upgrade-browserlistrc
main-jd-use-host
main-lmp-dark-theme-customization
main-lmp-handle-scroll-target
main-lmp-tab-fix
more-darkmode-examples
patrickhlauke-issue37428
patrickhlauke-use-of-color-tweaks
pr/37590
previous-next-docs-links
sticky-thead
utilities-functions-mixin
v530-dev
v6-postcss-custom-media
v6-spinner-dots
v6/gs/use-floating-ui-in-place-of-popper
xmr/dev
xmr/docs-png
xmr/docs-svgs
xmr/js-2
xmr/markdownlint
xmr/prepare-530-alpha2
xmr/xo
v5.3.0-alpha1
v5.2.3
v5.2.2
v5.2.1
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
site/assets/scss/_navbar.scss
+6
-0
site/assets/scss/_navbar.scss
site/assets/scss/_search.scss
+20
-1
site/assets/scss/_search.scss
site/layouts/partials/docs-navbar.html
+12
-10
site/layouts/partials/docs-navbar.html
with
38 additions
and
11 deletions
+38
-11
site/assets/scss/_navbar.scss
+
6
-
0
View file @
3feaf6ca
...
...
@@ -4,6 +4,12 @@
background-image
:
linear-gradient
(
to
bottom
,
rgba
(
var
(
--
bd-violet-rgb
)
,
1
)
,
rgba
(
var
(
--
bd-violet-rgb
)
,
.95
));
box-shadow
:
0
.5rem
1rem
rgba
(
0
,
0
,
0
,
.15
)
,
inset
0
-1px
0
rgba
(
0
,
0
,
0
,
.15
);
.bd-navbar-toggle
{
@include
media-breakpoint-down
(
lg
)
{
width
:
4
.25rem
;
}
}
.navbar-toggler
{
padding
:
0
;
margin-right
:
-.5rem
;
...
...
This diff is collapsed.
Click to expand it.
site/assets/scss/_search.scss
+
20
-
1
View file @
3feaf6ca
...
...
@@ -2,7 +2,6 @@
.bd-search
{
position
:
relative
;
width
:
100%
;
@include
media-breakpoint-up
(
lg
)
{
position
:
absolute
;
...
...
@@ -57,6 +56,26 @@
opacity
:
1
;
}
}
@include
media-breakpoint-down
(
lg
)
{
&
,
&
:hover
,
&
:focus
{
background
:
transparent
;
border
:
0
;
box-shadow
:
none
;
}
&
:focus
{
box-shadow
:
var
(
--
docsearch-searchbox-shadow
);
}
}
}
.DocSearch-Button-Keys
,
.DocSearch-Button-Placeholder
{
@include
media-breakpoint-down
(
lg
)
{
display
:
none
;
}
}
.DocSearch-Button-Keys
{
...
...
This diff is collapsed.
Click to expand it.
site/layouts/partials/docs-navbar.html
+
12
-
10
View file @
3feaf6ca
<header
class=
"navbar navbar-expand-lg navbar-dark bd-navbar sticky-top"
>
<nav
class=
"container-xxl bd-gutter flex-wrap flex-lg-nowrap"
aria-label=
"Main navigation"
>
{{- if eq .Layout "docs" }}
<div
class=
"bd-navbar-toggle"
>
<button
class=
"navbar-toggler p-2"
type=
"button"
data-bs-toggle=
"offcanvas"
data-bs-target=
"#bdSidebar"
aria-controls=
"bdSidebar"
aria-label=
"Toggle docs navigation"
>
{{ partial "icons/hamburger.svg" (dict "class" "bi" "width" "24" "height" "24") }}
<span
class=
"d-none fs-6 pe-1"
>
Browse
</span>
</button>
</div>
{{- else }}
<div
class=
"d-lg-none"
style=
"width:
2.2
5rem;"
></div>
<div
class=
"d-lg-none"
style=
"width:
1.
5rem;"
></div>
{{- end }}
<a
class=
"navbar-brand p-0 me-0 me-lg-2"
href=
"/"
aria-label=
"Bootstrap"
>
{{ partial "icons/bootstrap-white-fill.svg" (dict "class" "d-block my-1" "width" "40" "height" "32") }}
</a>
<button
class=
"navbar-toggler d-flex d-lg-none order-3 p-2"
type=
"button"
data-bs-toggle=
"offcanvas"
data-bs-target=
"#bdNavbar"
aria-controls=
"bdNavbar"
aria-label=
"Toggle navigation"
>
<svg
class=
"bi"
aria-hidden=
"true"
><use
xlink:href=
"#three-dots"
></use></svg>
</button>
<div
class=
"d-flex"
>
{{ if eq .Layout "docs" }}
<div
class=
"bd-search"
id=
"docsearch"
data-bd-docs-version=
"{{ .Site.Params.docs_version }}"
></div>
{{ end }}
<button
class=
"navbar-toggler d-flex d-lg-none order-3 p-2"
type=
"button"
data-bs-toggle=
"offcanvas"
data-bs-target=
"#bdNavbar"
aria-controls=
"bdNavbar"
aria-label=
"Toggle navigation"
>
<svg
class=
"bi"
aria-hidden=
"true"
><use
xlink:href=
"#three-dots"
></use></svg>
</button>
</div>
<div
class=
"offcanvas-lg offcanvas-end flex-grow-1"
tabindex=
"-1"
id=
"bdNavbar"
aria-labelledby=
"bdNavbarOffcanvasLabel"
data-bs-scroll=
"true"
>
<div
class=
"offcanvas-header px-4 pb-0"
>
...
...
@@ -45,12 +53,6 @@
<hr
class=
"d-lg-none text-white-50"
>
{{ if eq .Layout "docs" }}
<div
class=
"bd-search"
id=
"docsearch"
data-bd-docs-version=
"{{ .Site.Params.docs_version }}"
></div>
<hr
class=
"d-lg-none text-white-50"
>
{{ end }}
<ul
class=
"navbar-nav flex-row flex-wrap ms-md-auto"
>
<li
class=
"nav-item col-6 col-lg-auto"
>
<a
class=
"nav-link py-2 px-0 px-lg-2"
href=
"{{ .Site.Params.github_org }}"
target=
"_blank"
rel=
"noopener"
>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets