diff options
| author | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-11-28 09:53:03 +0530 |
|---|---|---|
| committer | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-11-28 09:53:03 +0530 |
| commit | 91b19d1a7ce76d8d5a86b846f54bcf6824de705d (patch) | |
| tree | 80ccd5e6a2eab1eff55574b6b1c768d71f1a02fc /addons/web/static/src/css | |
| parent | 1db3fca04a217de4083a63c72dc04e943e252589 (diff) | |
| parent | f63bdc67e28692028afcb31e46009e969d11d130 (diff) | |
[Merge] Merge with trunk.
bzr revid: mdi@tinyerp.com-20121128042303-eu3ttdp9nvt99o2k
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 4 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 9b99258a3a7..ee81492b8ad 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -30,7 +30,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp.openerp_webclient_container { height: 100%; @@ -807,8 +807,6 @@ padding: 0 0 4px 0; } .openerp .oe_login button { - float: right; - display: inline-block; cursor: pointer; padding: 6px 16px; border: 1px solid #222222; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2bc13dc26c9..2474ba9dc06 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -686,8 +686,6 @@ $sheet-padding: 16px list-style-type: none padding: 0 0 4px 0 button - float: right - display: inline-block cursor: pointer padding: 6px 16px border: 1px solid #222 |