aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Gallagher <[email protected]>2012-01-19 21:02:00 +0000
committerNicolas Gallagher <[email protected]>2012-01-19 22:27:24 +0000
commit8825443d6e6ff28a97e092f46b42ec508e58cb05 (patch)
tree5b582c7ca699649956fa35eb050ac98f003a2174
parent25ac318d33329a0fb532d5f9ec922ad76d791959 (diff)
downloadbootstrap-8825443d6e6ff28a97e092f46b42ec508e58cb05.tar.xz
bootstrap-8825443d6e6ff28a97e092f46b42ec508e58cb05.zip
Remove search input cancel button in WebKit-OSX.
On input elements with a `type` of `search`, WebKit on OS X will display a cancel button after text has been entered. This can look ugly or be poorly position when you've added other styles to the input (especially additional padding).
-rw-r--r--bootstrap.css4
-rw-r--r--bootstrap.min.css2
-rw-r--r--lib/reset.less5
3 files changed, 6 insertions, 5 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 4dcf33955..959eb2421 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Thu 19 Jan 2012 20:33:11 GMT
+ * Date: Thu 19 Jan 2012 22:27:04 GMT
*/
html, body {
margin: 0;
@@ -163,7 +163,7 @@ input[type="search"] {
-moz-box-sizing: content-box;
box-sizing: content-box;
}
-input[type="search"]::-webkit-search-decoration {
+input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button {
-webkit-appearance: none;
}
textarea {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 97700e87a..f71a05e04 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -18,7 +18,7 @@ button,input{*overflow:visible;line-height:normal;}
button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;}
button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;}
input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;}
-input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}
+input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;}
textarea{overflow:auto;vertical-align:top;}
body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#555555;background-color:#ffffff;}
.container{width:940px;margin-left:auto;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";}
diff --git a/lib/reset.less b/lib/reset.less
index 28638b6b3..8fe04d6d1 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -140,10 +140,11 @@ input[type="search"] { // Appearance in Safari/Chrome
-moz-box-sizing: content-box;
box-sizing: content-box;
}
-input[type="search"]::-webkit-search-decoration {
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
-webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5
}
textarea {
overflow: auto; // Remove vertical scrollbar in IE6-9
vertical-align: top; // Readability and alignment cross-browser
-} \ No newline at end of file
+}