diff --git a/bootstrap.css b/bootstrap.css index 4dcf339551..959eb24214 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 97700e87aa..f71a05e047 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 28638b6b37..8fe04d6d1e 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 +}