diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-04-08 10:37:33 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-04-08 10:37:33 +0200 |
| commit | a74eb749ae38784f370a9eeb073c3bbf09b35bbd (patch) | |
| tree | 3c83c289f1cb493d887ee8b647616465885fb3c9 /addons/web/static/src/css/base.sass | |
| parent | 423f81bf5cf4dd9e949fcabbd2babe4fe3187676 (diff) | |
| parent | f1d3f2a0c42f1de5970b5f897c4e5b279d1ee23b (diff) | |
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140401100513-e4iglorrxnj0ne8j
bzr revid: tde@openerp.com-20140403122017-zl668mpi0w5gwps0
bzr revid: tde@openerp.com-20140408083733-8plf5daah4c8yxxx
Diffstat (limited to 'addons/web/static/src/css/base.sass')
| -rw-r--r-- | addons/web/static/src/css/base.sass | 44 |
1 files changed, 39 insertions, 5 deletions
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b08427e0832..65f22a89481 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -385,6 +385,7 @@ $sheet-padding: 16px .oe_left float: left margin-right: 8px + width: 305px .oe_right float: right margin-left: 8px @@ -429,10 +430,40 @@ $sheet-padding: 16px &:hover background: #ED6F6A .oe_button_box - width: 270px - text-align: right - button - margin: 4px + width: 400px + text-align: left + .oe_stat_button:hover + background: #7c7bad + color: white + .fa + color: white + .oe_stat_button + font-weight: normal + display: inline-table + width: 33% !important + height: 42px + margin: 0px -1px -1px 0px + padding: 0 + color: #666 + border: 1px solid #dddddd + border-radius: 0 + box-shadow: none + background: white + > div + display: table-cell + vertical-align: middle + text-align: left + padding: 0 + line-height: 120% + .stat_button_icon + color: #7C7BAD + font-size: 24px + padding: 0px 3px + width: 37px + text-align: center + svg + width: 38px + height: 38px .oe_avatar > img max-height: 90px @@ -1037,10 +1068,12 @@ $sheet-padding: 16px height: inherit width: 100% .oe_view_manager_body - display: table-row height: inherit .oe_view_manager_view_kanban:not(:empty) height: inherit + &[data-view-type=kanban] + .oe_view_manager_body + display: table-row table.oe_view_manager_header border-collapse: separate @@ -1920,6 +1953,7 @@ $sheet-padding: 16px // Position: relative is used for the hidden input[type=file] // Do not remove it anymore ! position: relative + overflow-x: hidden input.oe_form_binary_file z-index: 0 line-height: 0 |