IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adjust nesting of search divs

Browse Source
This commit is contained in:
Robin Ward 2017-09-12 11:14:13 -04:00
parent 171d9e5aed
commit bc613e1df5
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/assets/javascripts/discourse/widgets/search-menu.js.es6
View File

@ -115,26 +115,29 @@ export default createWidget('search-menu', {
panelContents() {
const contextEnabled = searchData.contextEnabled;
const results = [
let searchInput = [
this.attach('search-term', { value: searchData.term, contextEnabled }),
];
if (searchData.term && searchData.loading) {
searchInput.push(h('div.searching', h('div.spinner')));
}
const results = [
h('div.search-input', searchInput),
this.attach('search-context', {
contextEnabled,
url: this.fullSearchUrl({ expanded: true })
})
];
if (searchData.term) {
if (searchData.loading) {
results.push(h('div.searching', h('div.spinner')));
} else {
results.push(this.attach('search-menu-results', {
term: searchData.term,
noResults: searchData.noResults,
results: searchData.results,
invalidTerm: searchData.invalidTerm,
searchContextEnabled: searchData.contextEnabled,
}));
}
if (searchData.term && !searchData.loading) {
results.push(this.attach('search-menu-results', {
term: searchData.term,
noResults: searchData.noResults,
results: searchData.results,
invalidTerm: searchData.invalidTerm,
searchContextEnabled: searchData.contextEnabled,
}));
}
return results;

8
app/assets/stylesheets/common/base/menu-panel.scss
View File

@ -129,13 +129,9 @@
.searching {
position: absolute;
top: 0.25em;
right: 1.5em;
top: -3px;
right: 0.75em;
.drop-down-visible & {
top: 0.2em;
right: 1.2em;
}
.spinner {
width: 10px;
height: 10px;