diff --git a/doc/doc-contrib-guide/source/doc-tools/template-generator.rst b/doc/doc-contrib-guide/source/doc-tools/template-generator.rst
index b855278bae..bf6e7ba393 100644
--- a/doc/doc-contrib-guide/source/doc-tools/template-generator.rst
+++ b/doc/doc-contrib-guide/source/doc-tools/template-generator.rst
@@ -132,9 +132,9 @@ Here are a few representative files under ``www/``:
* ``script_footer.tmpl``
* ``script_search.tmpl``
* ``series_status.tmpl``
- * ``swiftype_search_install.tmpl``
- * ``swiftype_search_mobile.tmpl``
- * ``swiftype_search.tmpl``
+ * ``os_search_install.tmpl``
+ * ``os_search_mobile.tmpl``
+ * ``os_search.tmpl``
* ``training_guides.tmpl``
* ``user_guides.tmpl``
diff --git a/www/de/index.html b/www/de/index.html
index cb690ace85..1dd855d52f 100644
--- a/www/de/index.html
+++ b/www/de/index.html
@@ -18,7 +18,7 @@
Anleitungen lesen
OpenStack holen
Trainieren
- {% include 'templates/swiftype_search.tmpl' %}
+ {% include 'templates/os_search.tmpl' %}
diff --git a/www/fr/index.html b/www/fr/index.html
index 271d4c2aec..13e139047b 100644
--- a/www/fr/index.html
+++ b/www/fr/index.html
@@ -18,7 +18,7 @@
Consulter les manuels
Obtenir OpenStack
Se former
- {% include 'templates/swiftype_search.tmpl' %}
+ {% include 'templates/os_search.tmpl' %}
diff --git a/www/id/index.html b/www/id/index.html
index b56b055be4..58796c11ce 100644
--- a/www/id/index.html
+++ b/www/id/index.html
@@ -18,7 +18,7 @@
Melihat Dokumen
Mendapatkan OpenStack
Mendapatkan Pelatihan
- {% include 'templates/swiftype_search.tmpl' %}
+ {% include 'templates/os_search.tmpl' %}
diff --git a/www/ja/index.html b/www/ja/index.html
index 760d62066c..d95f5fa0e9 100644
--- a/www/ja/index.html
+++ b/www/ja/index.html
@@ -18,7 +18,7 @@
ドキュメントの参照
OpenStack の取得
トレーニングの受講
- {% include 'templates/swiftype_search.tmpl' %}
+ {% include 'templates/os_search.tmpl' %}
diff --git a/www/ko_KR/index.html b/www/ko_KR/index.html
index 93633858ae..5bfb0703b3 100644
--- a/www/ko_KR/index.html
+++ b/www/ko_KR/index.html
@@ -18,7 +18,7 @@
문서보기
OpenStack 시작하기
배우기
- {% include 'templates/swiftype_search.tmpl' %}
+ {% include 'templates/os_search.tmpl' %}
diff --git a/www/mitaka/de/index.html b/www/mitaka/de/index.html
index 4b17fc9061..2246f400d7 100644
--- a/www/mitaka/de/index.html
+++ b/www/mitaka/de/index.html
@@ -18,7 +18,7 @@
Anleitungen lesen
OpenStack holen
Trainieren
- {% include 'templates/swiftype_search.tmpl' %}
+ {% include 'templates/os_search.tmpl' %}
diff --git a/www/newton/de/index.html b/www/newton/de/index.html
index 9979313f52..4d82c100bb 100644
--- a/www/newton/de/index.html
+++ b/www/newton/de/index.html
@@ -18,7 +18,7 @@
Anleitungen lesen
OpenStack holen
Trainieren
- {% include 'templates/swiftype_search.tmpl' %}
+ {% include 'templates/os_search.tmpl' %}
diff --git a/www/ocata/de/index.html b/www/ocata/de/index.html
index d647ac4074..c187ad8216 100644
--- a/www/ocata/de/index.html
+++ b/www/ocata/de/index.html
@@ -18,7 +18,7 @@
Anleitungen lesen
OpenStack holen
Trainieren
- {% include 'templates/swiftype_search.tmpl' %}
+ {% include 'templates/os_search.tmpl' %}
diff --git a/www/static/common/css/combined.css b/www/static/common/css/combined.css
index 117d93b4b5..0adf674936 100644
--- a/www/static/common/css/combined.css
+++ b/www/static/common/css/combined.css
@@ -752,25 +752,6 @@ span.message {
font-weight: bold;
color: #CE332C; }
-.gsc-control-cse {
- padding: 0px !important; }
-
-#gcse {
- width: 100%;
- height: 60px; }
-
-input.gsc-search-button, input.gsc-search-button:hover, input.gsc-search-button:focus {
- background: #C43422 !important;
- border: none !important; }
-
-table.gsc-search-box td {
- padding: 0px !important; }
-
-.gsc-input-box {
- border-color: #D3E9EF !important; }
-
-.gs-visibleUrl, .gs-visibleUrl-long {
- color: #A5A5A5 !important; }
.roundedButton-margin {
margin-left: 5px; }
@@ -1031,175 +1012,6 @@ i.fa-caret-right {
height: 3px;
border-radius: 3px; }
-
-
-.search-container {
- position: relative;
- display: none;
- float: left;
- width: 84%; }
-
-@media (min-width: 768px) and (max-width: 1200px) {
- .search-container
- {
- width: 80%;
- }
-}
-
-@media (max-width: 767px), only screen and (max-device-width: 1024px) {
- .search-container
- {
- display: none;
- }
-}
-
-.search-icon {
- display: none;
- padding: 17px 20px 16px;
- float: left;
- text-transform: uppercase;
- color: #8a959e;
- font-size: 12px;
- font-weight: 400;
-}
-
-.search-icon:hover {
- cursor: pointer;
- color: #8a959e;
-}
-
-.search-icon i {
- margin-right: 5px;
- color: #8a959e;
-}
-
-@media (max-width: 767px), only screen and (max-device-width: 1024px) {
- .search-icon
- {
- display: none !important;
- }
-}
-
-@media (max-width: 1040px) {
- .header-search-text
- {
- display: none;
- }
-}
-
-@media (max-width: 767px), only screen and (max-device-width: 1024px) {
- .header-search-form
- {
- display: none;
- }
- .custom-search-box
- {
- position: relative !important;
- left: 0px !important;;
- }
-}
-
-.custom-search-box {
- color: #30739C !important;
- font-size: 12px !important;
- text-transform: lowercase !important;
- font-weight: 400 !important;
- width: 100% !important;
-}
-
-.custom-search-box-mobile
-{
- display: none !important;
- position: relative;
- width: 100% !important;
-}
-
-@media (max-width: 767px), only screen and (max-device-width: 1024px) {
- .custom-search-box-mobile
- {
- display: block !important;
- }
- .custom-search-box {
- display: none !important;
- }
-}
-
-.header-search, .custom-search-box, .custom-search-box-mobile {
- border: 2px solid #dae5ee !important;
- border-radius: 4px !important;
- height: 37px !important;
- margin: 7px 0 0 0 !important;
- padding: 0 !important;
- padding-left: 10px !important;
- background: #fff !important;
- width: 100% !important;
- -webkit-transition: width 4s !important;
- transition: width 4s !important;
- -webkit-border-horizontal-spacing: 0 !important;
- -webkit-border-vertical-spacing: 0 !important;
-}
-
-.header-search contenteditable .custom-search-box-mobile:hover, .custom-search-box-mobile:focus, .custom-search-box:hover, .custom-search-box:focus {
- box-shadow: none !important;
-}
-
-.header-search::-webkit-input-placeholder, .custom-search-box::-webkit-input-placeholder,custom-search-box-mobile::-webkit-input-placeholder {
- color: #C0CDDB;
- font-size: 12px;
- text-transform: lowercase;
- font-weight: 400;
-}
-
-.header-search:-moz-placeholder, .custom-search-box-mobile:-moz-placeholder, custom-search-box:-moz-placeholder {
- /* Firefox 18- */
- color: #C0CDDB;
- font-size: 12px;
- text-transform: lowercase;
- font-weight: 400;
-}
-
-.header-search::-moz-placeholder, .custom-search-box::-moz-placeholder, custom-search-box-mobile::-moz-placeholder {
- /* Firefox 19+ */
- color: #C0CDDB;
- font-size: 12px;
- text-transform: lowercase;
- font-weight: 400; }
-
-.header-search:-ms-input-placeholder, .custom-search-box:-ms-input-placeholder, custom-search-box-mobile:-ms-input-placeholder {
- color: #C0CDDB;
- font-size: 12px;
- text-transform: lowercase;
- font-weight: 400; }
-
-.header-search:focus, .custom-search-box:focus, .custom-search-box-mobile:focus {
- border-radius: 4px;
- outline: none;
- border: 2px solid #30739C !important;
- box-shadow: none;
-}
-
-.close-search {
- position: absolute;
- top: 20px;
- right: 10px;
- color: #dae5ee;
- z-index: 1001;
- font-size: 16px;
-}
-
-.close-search:hover
-{
- color: #30739C;
- cursor: pointer;
-}
-
-@media (max-width: 767px), only screen and (max-device-width: 1024px) {
- .close-search
- {
- display: none !important;
- }
-}
-
.show
{
display: block;
@@ -3635,11 +3447,6 @@ a.overview-btn.docs-btn i {
line-height: 50px;
vertical-align: middle; }
-.docs-main-search-form {
- width: 98%;
- margin-top: 10px;
- float: left;
- position: relative; }
i.docs-search-icon {
position: absolute;
diff --git a/www/static/common/css/deprecated-badge.css b/www/static/common/css/deprecated-badge.css
index efe3f383e0..c88b3d39f5 100644
--- a/www/static/common/css/deprecated-badge.css
+++ b/www/static/common/css/deprecated-badge.css
@@ -84,7 +84,6 @@ a.deprecated-badge-right {
margin-top: 5px;
left:99%;
cursor: pointer;
-
}
.deprecated-badge-maintained .deprecated-badge-close-button{
@@ -97,4 +96,10 @@ a.deprecated-badge-right {
.deprecated-badge-current .deprecated-badge-close-button{
color: white !important;
+}
+
+@media (max-width: 767px), only screen and (max-device-width: 1024px) {
+ .deprecated-badge .deprecated-badge-close-button{
+ left:97%;
+ }
}
\ No newline at end of file
diff --git a/www/static/common/css/search.css b/www/static/common/css/search.css
new file mode 100644
index 0000000000..6b80e6fe1a
--- /dev/null
+++ b/www/static/common/css/search.css
@@ -0,0 +1,26 @@
+/*hide close button*/
+.ossw-search-bar-close {
+ display: none !important;
+}
+
+#search-bar-input{
+ width: 98% !important;
+ margin-top: 10px !important;
+}
+
+.search-container-mobile
+{
+ display: none !important;
+ position: relative !important;
+ width: 100% !important;
+}
+
+@media (max-width: 767px), only screen and (max-device-width: 1024px) {
+ .search-container-mobile
+ {
+ display: block !important;
+ }
+ .search-container {
+ display: none !important;
+ }
+}
\ No newline at end of file
diff --git a/www/static/common/js/navigation.js b/www/static/common/js/navigation.js
index db6a3a84f7..6f8a866561 100644
--- a/www/static/common/js/navigation.js
+++ b/www/static/common/js/navigation.js
@@ -1,21 +1,3 @@
-// Open header search bar
-$(function() {
- $(".search-icon").click(function() {
- $(".navbar-main").toggleClass("show");
- $(".search-container").toggleClass("show");
- $(".search-icon").toggleClass("show");
- $('.custom-search-box').focus();
- });
-});
-
-// Close header search bar
-$(function() {
- $(".close-search").click(function() {
- $(".navbar-main").toggleClass("show");
- $(".search-container").toggleClass("show")
- $(".search-icon").toggleClass("show");
- });
-});
// Open header drop downs on hover
jQuery(document).ready(function(){
@@ -30,6 +12,7 @@ jQuery(document).ready(function(){
$('ul.navbar-main li ul.dropdown-menu').removeClass('dropdown-hover');
}
});
+
jQuery(window).resize(function () {
if (jQuery(window).width() > 767) {
$('ul.navbar-main li ul.dropdown-menu').addClass('dropdown-hover');
@@ -43,23 +26,5 @@ jQuery(window).resize(function () {
}
});
-// Remove Search text in smaller browser windows
-jQuery(document).ready(function(){
- if (jQuery(window).width() < 1050) {
- $('#search-label').text('');
- } else {
- $('#search-label').text('Search');
- }
-});
-
-jQuery(window).resize(function () {
- if (jQuery(window).width() < 1050) {
- $('#search-label').text('');
- } else {
- $('#search-label').text('Search');
- }
-});
-
-
diff --git a/www/templates/css.tmpl b/www/templates/css.tmpl
index 7bb1b4ee44..f14c2664d5 100644
--- a/www/templates/css.tmpl
+++ b/www/templates/css.tmpl
@@ -4,6 +4,9 @@
+
+
+
diff --git a/www/templates/header.tmpl b/www/templates/header.tmpl
index 91b371233d..42b5b9fbce 100644
--- a/www/templates/header.tmpl
+++ b/www/templates/header.tmpl
@@ -1,7 +1,7 @@
- {% include 'templates/swiftype_search_install.tmpl' %}
+ {% include 'templates/os_search_install.tmpl' %}