-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1453 from Acris/bugfix
fixed: conflict between local search and algoia search
- Loading branch information
Showing
7 changed files
with
135 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
source/css/_common/components/third-party/algolia-search.styl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
193 changes: 89 additions & 104 deletions
193
source/css/_common/components/third-party/localsearch.styl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,117 +1,102 @@ | ||
ul.search-result-list { | ||
padding: 0; | ||
margin: 0 5px; | ||
} | ||
.local-search-pop-overlay | ||
position: fixed | ||
width: 100% | ||
height: 100% | ||
top: 0 | ||
left: 0 | ||
z-index: 2080 | ||
background-color: rgba(0, 0, 0, 0.3) | ||
|
||
p.search-result { | ||
border-bottom: 1px dashed #ccc; | ||
padding: 5px 0; | ||
} | ||
.local-search-popup | ||
display: none | ||
position: fixed | ||
top: 10% | ||
left: 50% | ||
margin-left: -350px | ||
width: 700px | ||
height: 80% | ||
padding: 0 | ||
background: #fff | ||
color: #333 | ||
z-index: 9999 | ||
border-radius: 5px | ||
+mobile() | ||
padding: 0 | ||
top: 0 | ||
left: 0 | ||
margin: 0 | ||
width: 100% | ||
height: 100% | ||
border-radius: 0 | ||
|
||
a.search-result-title { | ||
font-weight: bold; | ||
font-size: 16px; | ||
} | ||
ul.search-result-list | ||
padding: 0 | ||
margin: 0 5px | ||
|
||
.search-keyword { | ||
border-bottom: 1px dashed #f00; | ||
font-size: 14px; | ||
font-weight: bold; | ||
color: #f00; | ||
} | ||
p.search-result | ||
border-bottom: 1px dashed #ccc | ||
padding: 5px 0 | ||
|
||
.local-search-header { | ||
padding: 5px; | ||
height: 36px; | ||
background: #f5f5f5; | ||
border-top-left-radius: 5px; | ||
border-top-right-radius: 5px; | ||
} | ||
a.search-result-title | ||
font-weight: bold | ||
font-size: 16px | ||
|
||
#local-search-result { | ||
overflow: auto; | ||
position: relative; | ||
padding: 5px 25px; | ||
height: calc(100% - 55px); | ||
} | ||
.search-keyword | ||
border-bottom: 1px dashed #f00 | ||
font-size: 14px | ||
font-weight: bold | ||
color: #f00 | ||
|
||
.popup { | ||
display: none; | ||
position: fixed; | ||
top: 10%; | ||
left: 50%; | ||
margin-left: -350px; | ||
width: 700px; | ||
height: 80%; | ||
padding: 0; | ||
background: #fff; | ||
color: #333; | ||
z-index: 9999; | ||
border-radius: 5px; | ||
+mobile() { | ||
padding: 0; | ||
top: 0; | ||
left: 0; | ||
margin: 0; | ||
width: 100%; | ||
height: 100%; | ||
border-radius: 0px; | ||
} | ||
} | ||
.local-search-header | ||
padding: 5px | ||
height: 36px | ||
background: #f5f5f5 | ||
border-top-left-radius: 5px | ||
border-top-right-radius: 5px | ||
|
||
.popoverlay { | ||
position: fixed; | ||
width: 100%; | ||
height: 100%; | ||
top: 0px; | ||
left: 0px; | ||
z-index: 2080; | ||
background-color: rgba(0, 0, 0, 0.3); | ||
} | ||
#local-search-result | ||
overflow: auto | ||
position: relative | ||
padding: 5px 25px | ||
height: calc(100% - 55px) | ||
|
||
.local-search-input-wrapper { | ||
display: inline-block; | ||
width: calc(100% - 60px); | ||
height: 36px; | ||
line-height: 36px; | ||
padding: 0 5px; | ||
} | ||
.local-search-input-wrapper | ||
display: inline-block | ||
width: calc(100% - 60px) | ||
height: 36px | ||
line-height: 36px | ||
padding: 0 5px | ||
|
||
.local-search-input-wrapper input { | ||
padding: 8px 0; | ||
height: 20px; | ||
display: block; | ||
width: 100%; | ||
outline: none; | ||
border: none; | ||
background: transparent; | ||
vertical-align: middle; | ||
} | ||
.local-search-input-wrapper input | ||
padding: 8px 0 | ||
height: 20px | ||
display: block | ||
width: 100% | ||
outline: none | ||
border: none | ||
background: transparent | ||
vertical-align: middle | ||
|
||
.search-icon, .popup-btn-close { | ||
display: inline-block; | ||
font-size: 18px; | ||
color: #999; | ||
height: 36px; | ||
width: 18px; | ||
} | ||
.search-icon, .popup-btn-close | ||
display: inline-block | ||
font-size: 18px | ||
color: #999 | ||
height: 36px | ||
width: 18px | ||
|
||
.search-icon { | ||
float: left; | ||
} | ||
.search-icon | ||
float: left | ||
|
||
.popup-btn-close { | ||
border-left: 1px solid #eee; | ||
float: right; | ||
cursor: pointer; | ||
padding-left: 10px; | ||
} | ||
.popup-btn-close | ||
border-left: 1px solid #eee | ||
float: right | ||
cursor: pointer | ||
padding-left: 10px | ||
|
||
#no-result { | ||
position: absolute; | ||
left: 50%; | ||
top: 50%; | ||
-webkit-transform: translate(-50%, -50%); | ||
transform: translate(-50%, -50%); | ||
color: #ccc; | ||
} | ||
#no-result | ||
position: absolute | ||
left: 50% | ||
top: 50% | ||
-webkit-transform: translate(-50%, -50%) | ||
transform: translate(-50%, -50%) | ||
color: #ccc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters