8000 fix docsearch in sidebar (#323) · poorprogrammer/vuejs.org@fc9801b · GitHub
[go: up one dir, main page]

Skip to content

Commit fc9801b

Browse files
authored
fix docsearch in sidebar (vuejs#323)
1 parent 9e6c1d0 commit fc9801b

File tree

8 files changed

+25
-14
lines changed

8 files changed

+25
-14
lines changed

themes/vue/layout/partials/blog.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="sidebar">
22
<ul class="main-menu">
3-
<%- partial('partials/main_menu') %>
3+
<%- partial('partials/main_menu', { context: 'sidebar' }) %>
44
</ul>
55
</div>
66
<div class="content blog">

themes/vue/layout/partials/header.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<span>Vue.js</span>
55
</a>
66
<ul id="nav">
7-
<%- partial('partials/main_menu') %>
7+
<%- partial('partials/main_menu', { context: 'nav' }) %>
88
</ul>
9-
</div>
9+
</div>

themes/vue/layout/partials/main_menu.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<li>
22
<form id="search-form">
3-
<input type="text" id="search-query" class="st-default-search-input">
3+
<input type="text" id="search-query-<%- context %>" class="search-query st-default-search-input">
44
</form>
55
</li>
66
<li><a href="/guide/" class="nav-link<%- page.path.match(/guide/) ? ' current' : '' %>">Guide</a></li>

themes/vue/layout/partials/sidebar.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="sidebar">
22
<ul class="main-menu">
3-
<%- partial('partials/main_menu') %>
3+
<%- partial('partials/main_menu', { context: 'sidebar' }) %>
44
</ul>
55
<div class="list">
66
<div id="donate" style="margin-bottom: 20px">

themes/vue/layout/post.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="sidebar blog">
22
<ul class="main-menu">
3-
<%- partial('partials/main_menu') %>
3+
<%- partial('partials/main_menu', { context: 'nav' }) %>
44
</ul>
55
<div class="list">
66
<h2>

themes/vue/source/css/_search.styl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@ $border = #ddd
66
line-height normal
77

88
.aa-dropdown-menu
9+
width 100%
910
border-color #999
1011
font-size 0.9rem
1112

13+
.sidebar
14+
.aa-dropdown-menu
15+
min-width auto
16+
1217
@media (min-width: 768px)
1318
.aa-dropdown-menu
1419
min-width: 515px

themes/vue/source/css/page.styl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ $header-height = 40px
3535
&:hover, &.current
3636
border-bottom 3px solid $green
3737

38-
#search-query
38+
.search-query
3939
height 30px
4040
line-height 30px
4141
box-sizing border-box
@@ -291,7 +291,7 @@ $header-height = 40px
291291
padding-bottom 1px
292292
&:hover, &.current
293293
border-bottom 2px solid $green
294-
#search-query
294+
.search-query
295295
width 200px
296296
margin-bottom 10px
297297
#mobile-bar

themes/vue/source/js/common.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,18 @@
1212
*/
1313

1414
function initSearch () {
15-
docsearch({
16-
appId: 'BH4D9OD16A',
17-
apiKey: '85cc3221c9f23bfbaa4e3913dd7625ea',
18-
indexName: 'vuejs',
19-
inputSelector: '#search-query'
20-
});
15+
[
16+
'#search-query-nav',
17+
'#search-query-sidebar'
18+
].forEach(function (selector) {
19+
if (!document.querySelector(selector)) return
20+
docsearch({
21+
appId: 'BH4D9OD16A',
22+
apiKey: '85cc3221c9f23bfbaa4e3913dd7625ea',
23+
indexName: 'vuejs',
24+
inputSelector: selector
25+
})
26+
})
2127
}
2228

2329
/**

0 commit comments

Comments
 (0)
0