diff options
| author | Géry Debongnie <ged@odoo.com> | 2014-10-27 12:07:20 +0100 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2014-10-29 08:38:19 +0100 |
| commit | 3b537ec121b2c05a147a0a66b022c913118a9314 (patch) | |
| tree | 4aabf423308050ea803c0676c51d1f455c52216e /addons/web/static/src/css | |
| parent | f76e7b4f1909df0dc2190f97d3c034e87c283cee (diff) | |
[FIX] various layout fixes for web client
* fallback support for browser without calc,
* invisible pager in some cases
* correct colors for oe_stars
* readd oe_webclient class
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 26 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 41 |
2 files changed, 37 insertions, 30 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 495d95ed3b7..64ad17efe07 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -82,6 +82,8 @@ */ } .openerp.openerp_webclient_container { + height: 95%; + height: -webkit-calc(100% - 34px); height: calc(100% - 34px); display: -ms-flexbox; display: -webkit-flex; @@ -89,6 +91,8 @@ } @media (max-width: 768px) { .openerp.openerp_webclient_container { + height: 95%; + height: -webkit-calc(100% - 52px); height: calc(100% - 52px); } } @@ -488,17 +492,17 @@ .openerp .oe_button.oe_link span:hover { text-decoration: underline; } -.openerp .oe_webclient .oe_star_on, .openerp .oe_webclient .oe_star_off { +.openerp .oe_star_on, .openerp .oe_star_off { color: #cccccc; text-shadow: 0 0 2px black; vertical-align: top; position: relative; top: -8px; } -.openerp .oe_webclient .oe_star_on:hover, .openerp .oe_webclient .oe_star_off:hover { +.openerp .oe_star_on:hover, .openerp .oe_star_off:hover { text-decoration: none; } -.openerp .oe_webclient .oe_star_on { +.openerp .oe_star_on { color: gold; } .openerp p.oe_grey { @@ -787,11 +791,6 @@ .openerp .oe_database_manager .oe_database_manager_menu { color: #000; } -.openerp .oe_webclient { - width: 100%; - height: 100%; - border-spacing: 0px; -} .openerp .oe_content_full_screen .oe_application { top: 0; left: 0; @@ -993,6 +992,7 @@ -ms-flex-negative: 1; display: inline-block\9; overflow: auto\9; + width: -webkit-calc(100% - 220px); width: calc(100% - 220px); } .openerp .oe_application .oe_application { @@ -1350,6 +1350,7 @@ } .openerp .oe-search-options .oe-group-selector { margin: 3px 25px; + min-width: -webkit-calc(100% - 40px); min-width: calc(100% - 40px); max-width: 250px; width: auto; @@ -1392,10 +1393,12 @@ } .openerp .oe-search-options .searchview_extended_prop_field { display: inline; + width: -webkic-calc(100% - 20px); width: calc(100% - 20px); } .openerp .oe-search-options .searchview_extended_prop_op { margin: 3px 0; + width: -webkit-calc(100% - 20px); width: calc(100% - 20px); } .openerp .oe-search-options .searchview_extended_delete_prop { @@ -1403,12 +1406,15 @@ display: inline; } .openerp .oe-search-options .searchview_extended_prop_value { + width: -webkit-calc(100% - 20px); width: calc(100% - 20px); } .openerp .oe-search-options .searchview_extended_prop_value > select, .openerp .oe-search-options .searchview_extended_prop_value > input { + width: -webkit-calc(100% - 20px); width: calc(100% - 20px); } .openerp .oe-search-options .searchview_extended_prop_value .oe_datepicker_main { + width: -webkit-calc(100% - 20px); width: calc(100% - 20px); } .openerp .oe-search-options .searchview_extended_prop_value .oe_datepicker_master { @@ -3073,15 +3079,13 @@ body.oe_single_form .oe_single_form_container { .modal .oe_act_window.modal-body { padding: 0; } -.modal .oe-modal-header { - background-color: #f0eeee; -} .modal .oe-view-manager-content > div { position: static !important; } @media (min-width: 768px) { .modal .modal-body { + max-height: -webkit-calc(100vh - 200px); max-height: calc(100vh - 200px); } } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f97d404219d..e04ed87d1c4 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -198,12 +198,16 @@ $sheet-padding: 16px font-size: 13px background: white &.openerp_webclient_container + height: 95% + height: -webkit-calc(100% - 34px) height: calc(100% - 34px) display: -ms-flexbox display: -webkit-flex display: flex @media (max-width: 768px) &.openerp_webclient_container + height: 95% + height: -webkit-calc(100% - 52px) height: calc(100% - 52px) // }}} //Placeholder style{{{ @@ -457,17 +461,16 @@ $sheet-padding: 16px font-weight: bold &:hover text-decoration: underline - .oe_webclient - .oe_star_on, .oe_star_off - color: #cccccc - text-shadow: 0 0 2px black - vertical-align: top - position: relative - top: -8px - .oe_star_on:hover, .oe_star_off:hover - text-decoration: none - .oe_star_on - color: gold + .oe_star_on, .oe_star_off + color: #cccccc + text-shadow: 0 0 2px black + vertical-align: top + position: relative + top: -8px + .oe_star_on:hover, .oe_star_off:hover + text-decoration: none + .oe_star_on + color: gold p.oe_grey max-width: 650px .oe_grey @@ -691,12 +694,6 @@ $sheet-padding: 16px .oe_database_manager_menu color: #000 // }}} - // WebClient {{{ - .oe_webclient - width: 100% - height: 100% - border-spacing: 0px - // }}} // WebClient.fullscreen {{{ .oe_content_full_screen .oe_application @@ -868,6 +865,7 @@ $sheet-padding: 16px -ms-flex-negative: 1 display: inline-block\9 overflow: auto\9 + width: -webkit-calc(100% - 220px) width: calc(100% - 220px) .oe_application width: 100% @@ -1154,6 +1152,7 @@ $sheet-padding: 16px padding-right: 10px .oe-group-selector margin: 3px 25px + min-width: -webkit-calc(100% - 40px) min-width: calc(100% - 40px) max-width: 250px width: auto @@ -1190,19 +1189,24 @@ $sheet-padding: 16px margin-left: 0 .searchview_extended_prop_field display: inline + width: -webkic-calc(100% - 20px) width: calc(100% - 20px) .searchview_extended_prop_op margin: 3px 0 + width: -webkit-calc(100% - 20px) width: calc(100% - 20px) .searchview_extended_delete_prop float: right display: inline .searchview_extended_prop_value + width: -webkit-calc(100% - 20px) width: calc(100% - 20px) > select, > input + width: -webkit-calc(100% - 20px) width: calc(100% - 20px) .oe_datepicker_main + width: -webkit-calc(100% - 20px) width: calc(100% - 20px) .oe_datepicker_master width: 100% @@ -2535,13 +2539,12 @@ body.oe_single_form margin: 0 4px 0 0 .oe_act_window.modal-body padding: 0 - .oe-modal-header - background-color: #f0eeee .oe-view-manager-content > div position: static !important @media (min-width: 768px) .modal .modal-body + max-height: -webkit-calc(100vh - 200px) max-height: calc(100vh - 200px) .ui-datepicker |
