diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2012-11-19 11:03:20 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2012-11-19 11:03:20 +0530 |
| commit | df184ad1f99c5fbe4f0ae95c7b87cbb1028635a4 (patch) | |
| tree | 83da437768129e158a3eb54b74687f712613b228 /addons/web/static/lib/jquery.ui.bootstrap/css | |
| parent | 4d1787644a2dd5105bd45a35241c97007d97fec5 (diff) | |
| parent | 37209eb5e76a7b373a0f302e1f62be32fd2f37d2 (diff) | |
[MERGE] Merge trunk.
bzr revid: jra@tinyerp.com-20121119053320-to7uhn8mk3xpvq8r
Diffstat (limited to 'addons/web/static/lib/jquery.ui.bootstrap/css')
| -rw-r--r-- | addons/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.9.0.custom.css | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/addons/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.9.0.custom.css b/addons/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.9.0.custom.css index a06e9447afc..f19c56caed1 100644 --- a/addons/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.9.0.custom.css +++ b/addons/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.9.0.custom.css @@ -1115,7 +1115,7 @@ body .ui-tooltip { border-width:2px; } /*** Input field styling from Bootstrap **/ - input, textarea { +/* input, textarea { -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -moz-transition: border linear 0.2s, box-shadow linear 0.2s; -ms-transition: border linear 0.2s, box-shadow linear 0.2s; @@ -1137,12 +1137,12 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus { -moz-box-shadow: none; box-shadow: none; outline: 1px dotted #666; -} +}*/ -input[type="text"], -input[type="password"], +/*input[type="text"], +input[type="password"],*/ .ui-autocomplete-input, -textarea, +/*textarea,*/ .uneditable-input { display: inline-block; padding: 4px; |
