Author: snagel
Date: Thu Jul 2 13:02:13 2020
New Revision: 1879440
URL: http://svn.apache.org/viewvc?rev=1879440&view=rev
Log:
Fix Google search box
Modified:
nutch/cms_site/trunk/content/assets/css/bootstrap.css
nutch/cms_site/trunk/templates/std.html
Modified: nutch/cms_site/trunk/content/assets/css/bootstrap.css
URL:
http://svn.apache.org/viewvc/nutch/cms_site/trunk/content/assets/css/bootstrap.css?rev=1879440&r1=1879439&r2=1879440&view=diff
==============================================================================
--- nutch/cms_site/trunk/content/assets/css/bootstrap.css (original)
+++ nutch/cms_site/trunk/content/assets/css/bootstrap.css Thu Jul 2 13:02:13
2020
@@ -152,18 +152,6 @@ input[type="checkbox"] {
cursor: pointer;
}
-input[type="search"] {
- -webkit-box-sizing: content-box;
- -moz-box-sizing: content-box;
- box-sizing: content-box;
- -webkit-appearance: textfield;
-}
-
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
- -webkit-appearance: none;
-}
-
textarea {
overflow: auto;
vertical-align: top;
@@ -1822,118 +1810,6 @@ select:focus:invalid:focus {
margin-left: 0;
}
-input.search-query {
- padding-right: 14px;
- padding-right: 4px \9;
- padding-left: 14px;
- padding-left: 4px \9;
- /* IE7-8 doesn't have border-radius, so don't indent the padding */
-
- margin-bottom: 0;
- -webkit-border-radius: 15px;
- -moz-border-radius: 15px;
- border-radius: 15px;
-}
-
-/* Allow for input prepend/append in search forms */
-
-.form-search .input-append .search-query,
-.form-search .input-prepend .search-query {
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- border-radius: 0;
-}
-
-.form-search .input-append .search-query {
- -webkit-border-radius: 14px 0 0 14px;
- -moz-border-radius: 14px 0 0 14px;
- border-radius: 14px 0 0 14px;
-}
-
-.form-search .input-append .btn {
- -webkit-border-radius: 0 14px 14px 0;
- -moz-border-radius: 0 14px 14px 0;
- border-radius: 0 14px 14px 0;
-}
-
-.form-search .input-prepend .search-query {
- -webkit-border-radius: 0 14px 14px 0;
- -moz-border-radius: 0 14px 14px 0;
- border-radius: 0 14px 14px 0;
-}
-
-.form-search .input-prepend .btn {
- -webkit-border-radius: 14px 0 0 14px;
- -moz-border-radius: 14px 0 0 14px;
- border-radius: 14px 0 0 14px;
-}
-
-.form-search input,
-.form-inline input,
-.form-horizontal input,
-.form-search textarea,
-.form-inline textarea,
-.form-horizontal textarea,
-.form-search select,
-.form-inline select,
-.form-horizontal select,
-.form-search .help-inline,
-.form-inline .help-inline,
-.form-horizontal .help-inline,
-.form-search .uneditable-input,
-.form-inline .uneditable-input,
-.form-horizontal .uneditable-input,
-.form-search .input-prepend,
-.form-inline .input-prepend,
-.form-horizontal .input-prepend,
-.form-search .input-append,
-.form-inline .input-append,
-.form-horizontal .input-append {
- display: inline-block;
- *display: inline;
- margin-bottom: 0;
- vertical-align: middle;
- *zoom: 1;
-}
-
-.form-search .hide,
-.form-inline .hide,
-.form-horizontal .hide {
- display: none;
-}
-
-.form-search label,
-.form-inline label,
-.form-search .btn-group,
-.form-inline .btn-group {
- display: inline-block;
-}
-
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
- margin-bottom: 0;
-}
-
-.form-search .radio,
-.form-search .checkbox,
-.form-inline .radio,
-.form-inline .checkbox {
- padding-left: 0;
- margin-bottom: 0;
- vertical-align: middle;
-}
-
-.form-search .radio input[type="radio"],
-.form-search .checkbox input[type="checkbox"],
-.form-inline .radio input[type="radio"],
-.form-inline .checkbox input[type="checkbox"] {
- float: left;
- margin-right: 3px;
- margin-left: 0;
-}
-
.control-group {
margin-bottom: 10px;
}
@@ -4503,20 +4379,10 @@ input[type="submit"].btn.btn-mini {
.navbar-search {
position: relative;
float: left;
- margin-top: 5px;
- margin-bottom: 0;
-}
-
-.navbar-search .search-query {
- padding: 4px 14px;
+ margin-top: 0;
margin-bottom: 0;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 13px;
- font-weight: normal;
- line-height: 1;
- -webkit-border-radius: 15px;
- -moz-border-radius: 15px;
- border-radius: 15px;
+ margin-right: 0;
+ width: 150%;
}
.navbar-static-top {
@@ -4866,44 +4732,6 @@ input[type="submit"].btn.btn-mini {
border-bottom-color: #ffffff;
}
-.navbar-inverse .navbar-search .search-query {
- color: #ffffff;
- background-color: #515151;
- border-color: #111111;
- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255,
255, 255, 0.15);
- -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255,
255, 255, 0.15);
- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255,
255, 255, 0.15);
- -webkit-transition: none;
- -moz-transition: none;
- -o-transition: none;
- transition: none;
-}
-
-.navbar-inverse .navbar-search .search-query:-moz-placeholder {
- color: #cccccc;
-}
-
-.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
- color: #cccccc;
-}
-
-.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
- color: #cccccc;
-}
-
-.navbar-inverse .navbar-search .search-query:focus,
-.navbar-inverse .navbar-search .search-query.focused {
- padding: 5px 15px;
- color: #333333;
- text-shadow: 0 1px 0 #ffffff;
- background-color: #ffffff;
- border: 0;
- outline: 0;
- -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
- -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
- box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-}
-
.navbar-inverse .btn-navbar {
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
Modified: nutch/cms_site/trunk/templates/std.html
URL:
http://svn.apache.org/viewvc/nutch/cms_site/trunk/templates/std.html?rev=1879440&r1=1879439&r2=1879440&view=diff
==============================================================================
--- nutch/cms_site/trunk/templates/std.html (original)
+++ nutch/cms_site/trunk/templates/std.html Thu Jul 2 13:02:13 2020
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<!DOCTYPE html>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -395,11 +395,12 @@ under the License.
<li><a
href="https://www.apache.org/foundation/thanks.html";>Thanks</a></li>
</ul>
</li>
- <form id="search-form" class="navbar-search
pull-right" action="https://www.google.com/cse"; method="get">
- <input value="nutch.apache.org" name="sitesearch"
type="hidden" />
- <input class="search-query" name="q" id="query" type="text"
/>
- </form>
- <script type="text/javascript"
src="https://www.google.com/coop/cse/brand?form=search-form";></script>
+ <li><!-- Google CSE -->
+ <div class="navbar-search">
+ <script async
src="https://cse.google.com/cse.js?cx=006255390463703629216:buzax6blok4";></script>
+ <div class="gcse-search"></div>
+ </div>
+ </li>
</ul>
</div><!--/.nav-collapse -->
</div><!-- /.navbar-inner -->
