diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 7e8242a8d5c..04c2bd9bf55 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1265,7 +1265,7 @@ color: white; padding: 2px 4px; margin: 1px 6px 0 0; - border: 1px solid lightgrey; + border: 1px solid lightGray; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1290,7 +1290,7 @@ transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { - border-top: 1px solid lightgrey; + border-top: 1px solid lightGray; border-bottom: 1px solid #dedede; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); @@ -2239,7 +2239,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkgreen; + color: darkGreen; vertical-align: top; position: relative; top: -4px; @@ -3127,6 +3127,9 @@ div.ui-widget-overlay { border-radius: 3px; } +.openerp_ie .oe_form_field_boolean input { + background: white; +} .openerp_ie input[type='checkbox'] { border: none; background: none; @@ -3186,8 +3189,62 @@ div.ui-widget-overlay { padding-top: 0; padding-bottom: 0; } -.openerp_ie .oe_form_field.oe_tags { - float: left; +.openerp_ie img { + border: none; +} +.openerp_ie .oe_dropdown_arrow { + line-height: 1.7em; +} +.openerp_ie .oe_form_buttons button, .openerp_ie .oe_view_manager_buttons button { + line-height: 1.7em; +} +.openerp_ie .oe_form_buttons .oe_highlight, .openerp_ie .oe_view_manager_buttons .oe_highlight { + line-height: 1.7em; +} +.openerp_ie .oe_topbar { + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#646060', endColorstr='#262626'); +} +.openerp_ie .oe_popup_form { + width: 99% !important; +} +.openerp_ie .oe_form_label { + white-space: normal !important; +} +.openerp_ie ul.oe_form_status li, .openerp_ie ul.oe_form_status_clickable li { + display: inline-block; + clear: both; +} +.openerp_ie ul.oe_form_status li:last-child, .openerp_ie ul.oe_form_status_clickable li:last-child { + overflow: hidden; + border-right: 1px solid #cacaca; +} +.openerp_ie ul.oe_form_status li:last-child .label, .openerp_ie ul.oe_form_status_clickable li:last-child .label { + padding-right: 14px; + border-right: none; +} +.openerp_ie ul.oe_form_status li:last-child .arrow, .openerp_ie ul.oe_form_status_clickable li:last-child .arrow { + display: inline-block; + opacity: 0; + filter: alpha(opacity=0); + border: none; + width: 0; + border-right: none; +} +.openerp_ie ul.oe_form_status .label, .openerp_ie ul.oe_form_status_clickable .label { + border-bottom: 1px solid #cacaca; + background: transparent; +} +.openerp_ie ul.oe_form_status .arrow span, .openerp_ie ul.oe_form_status_clickable .arrow span { + background-color: #fefefe !important; +} +.openerp_ie ul.oe_form_status li.oe_active .label, .openerp_ie ul.oe_form_status_clickable li.oe_active .label { + border-bottom: 1px solid #729fcf; +} +.openerp_ie ul.oe_form_status li.oe_active .arrow span, .openerp_ie ul.oe_form_status_clickable li.oe_active .arrow span { + background-color: #729fcf !important; +} +.openerp_ie .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8'); } @media print { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0369f5fd4b5..38daadc6f23 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2469,6 +2469,8 @@ div.ui-widget-overlay // Internet Explorer 9+ specifics {{{ .openerp_ie + .oe_form_field_boolean input + background: #fff input[type='checkbox'] border: none background: none @@ -2505,7 +2507,6 @@ div.ui-widget-overlay filter: none .oe_link filter: none - .oe_kanban_show_more clear: both text-align: center @@ -2519,9 +2520,54 @@ div.ui-widget-overlay .oe_sidebar button padding-top: 0 padding-bottom: 0 + img + border: none + //buttons. + .oe_dropdown_arrow + line-height: 1.7em + .oe_form_buttons, .oe_view_manager_buttons + button + line-height: 1.7em + .oe_highlight + line-height: 1.7em + .oe_topbar + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#646060', endColorstr='#262626') + .oe_popup_form + width: 99% !important + .oe_form_label + white-space: normal !important + ul.oe_form_status, ul.oe_form_status_clickable + li + display: inline-block + clear: both + &:last-child + overflow: hidden + border-right: 1px solid #cacaca + .label + padding-right: 14px + border-right: none + .arrow + display: inline-block + opacity: 0 + filter: alpha(opacity = 0) + border: none + width: 0 + border-right: none + .label + border-bottom: 1px solid #cacaca + background: transparent + .arrow + span + background-color: #fefefe !important + li.oe_active + .label + border-bottom: 1px solid #729fcf + .arrow span + background-color: #729fcf !important - .oe_form_field.oe_tags - float: left + // jquery ui for ie + .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8') // }}} // @media print {{{ diff --git a/addons/web/static/src/css/full.css b/addons/web/static/src/css/full.css index 2692792d46d..008f7950086 100644 --- a/addons/web/static/src/css/full.css +++ b/addons/web/static/src/css/full.css @@ -10,3 +10,7 @@ body { overflow-y: scroll; height: 100%; } + +.openerp .oe_application { + height: 100%; +} diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 325f92b621d..9026251acea 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -618,6 +618,21 @@ -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; } +.openerp_ie .oe_kanban_view .oe_kanban_group_header .oe_kanban_group_title_vertical { + display: none !important; +} +.openerp_ie .oe_kanban_view .oe_kanban_group_header.oe_kanban_group_folded .oe_kanban_group_title_vertical { + display: inline-block !important; +} +.openerp_ie .oe_kanban_view .oe_kanban_group_title_vertical { + -ms-writing-mode: lr-tb !important; + background: #f0eeee; + top: -5px !important; +} +.openerp_ie .oe_kanban_view.oe_kanban_grouped .oe_kanban_group_header { + height: 1%; +} + @media print { .openerp .oe_kanban_groups button { visibility: hidden; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index c115862ef0a..d6734124def 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -126,7 +126,7 @@ background: #f0eeee border-left: 1px solid #f0f8f8 border-right: 1px solid #b9b9b9 - &.oe_kanban_grouped + &.oe_kanban_grouped .oe_kanban_group_header width: 1% @@ -484,6 +484,7 @@ .oe_kanban_color_9 background-color: #FFC7F1 color: #6d2c70 + // }}} .openerp .oe_form .oe_kanban_view .oe_kanban_column, .oe_kanban_group_header @@ -506,6 +507,23 @@ @include vertical-gradient(#f6f6f6, #e3e3e3) @include box-shadow((0 1px 2px rgba(0, 0, 0, .1), 0 1px 1px rgba(255, 255, 255, .8) inset)) + +// Internet Explorer 9+ specifics {{{ +.openerp_ie .oe_kanban_view + .oe_kanban_group_header .oe_kanban_group_title_vertical + // TODO: check for IE10 + display: none !important + .oe_kanban_group_header.oe_kanban_group_folded .oe_kanban_group_title_vertical + display: inline-block !important + .oe_kanban_group_title_vertical + -ms-writing-mode: lr-tb !important + background: rgb(240, 238, 238) + top: -5px !important + &.oe_kanban_grouped + .oe_kanban_group_header + height: 1% +// }}} + @media print .openerp .oe_kanban_groups @@ -516,5 +534,6 @@ visibility: hidden .oe_kanban_view .oe_kanban_group_title text-shadow: none !important + // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: