Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <markdotto@gmail.com>2022-02-24 03:42:55 +0300
committerMark Otto <markdotto@gmail.com>2022-02-24 03:42:55 +0300
commitbe2b85d4e5b9d52500adce7222eccd9665f45bc5 (patch)
treec9f9581b7e9c3b03107482b85d4ae9b4aba89394
parent4d1d58c0ad5fc6d0ffcf2cc7f1a0532d43cca1f9 (diff)
Change shortcut key for search to join command palette fad, but preserve old shortcut too
-rw-r--r--site/assets/js/search.js7
-rw-r--r--site/assets/scss/_search.scss3
-rw-r--r--site/layouts/partials/docs-navbar.html2
3 files changed, 9 insertions, 3 deletions
diff --git a/site/assets/js/search.js b/site/assets/js/search.js
index d88263d3f3..dda9a5e828 100644
--- a/site/assets/js/search.js
+++ b/site/assets/js/search.js
@@ -14,12 +14,17 @@
var siteDocsVersion = inputElement.getAttribute('data-bd-docs-version')
document.addEventListener('keydown', function (event) {
- if (event.ctrlKey && event.key === '/') {
+ if ((((event.ctrlKey || event.metaKey) && event.key === 'k')) || (event.ctrlKey && event.key === '/')) {
event.preventDefault()
inputElement.focus()
}
})
+ if (navigator.platform.includes('Windows')) {
+ var searchShortcut = document.querySelector('.bd-search')
+ searchShortcut.setAttribute('data-shortcut', '⌃K')
+ }
+
window.docsearch({
apiKey: '5990ad008512000bba2cf951ccf0332f',
indexName: 'bootstrap',
diff --git a/site/assets/scss/_search.scss b/site/assets/scss/_search.scss
index 2154a6dd24..a9a90ec58b 100644
--- a/site/assets/scss/_search.scss
+++ b/site/assets/scss/_search.scss
@@ -14,7 +14,8 @@
padding-left: .3125rem;
@include font-size(.75rem);
color: rgba($white, .65);
- content: "Ctrl + /";
+ // content: "⌘K";
+ content: attr(data-shortcut);
background-color: rgba($white, .1);
@include border-radius(.125rem);
}
diff --git a/site/layouts/partials/docs-navbar.html b/site/layouts/partials/docs-navbar.html
index 909b9d1af8..b111b20af7 100644
--- a/site/layouts/partials/docs-navbar.html
+++ b/site/layouts/partials/docs-navbar.html
@@ -48,7 +48,7 @@
<hr class="d-lg-none text-white-50">
{{ if eq .Layout "docs" }}
- <form class="bd-search">
+ <form class="bd-search" data-shortcut="⌘K">
<input type="search" class="form-control" id="search-input" placeholder="Search docs..." aria-label="Search docs for..." autocomplete="off" data-bd-docs-version="{{ .Site.Params.docs_version }}">
</form>