diff --git a/.bzrignore b/.bzrignore index 1e0564801ab..3dc39eb6479 100644 --- a/.bzrignore +++ b/.bzrignore @@ -12,3 +12,4 @@ RE:^man/ RE:^lib/ RE:^addons/\w+/doc/_build/ +sa2.bat diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 4e40ca62be4..93fae7ce3a5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3158,8 +3158,63 @@ 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 { @@ -3206,51 +3261,3 @@ div.ui-widget-overlay { background-color: black; opacity: 0.6; } - -.openerp_ie img { - border: none; -} -.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 { - margin-right: -24px; - 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; -} -.openerp_ie ul.oe_form_status .label, .openerp_ie ul.oe_form_status_clickable .label { - border-bottom: 1px solid #cacaca; -} -.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'); -} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 180c4e277a9..30f88678c79 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2472,6 +2472,8 @@ div.ui-widget-overlay button .oe_form_button_create padding-top: 0 padding-bottom: 0 + .field_boolean + background: #fff .oe_kanban_image border: none .oe_msg_icon @@ -2484,7 +2486,8 @@ div.ui-widget-overlay filter: none .oe_link filter: none - + .oe_kanban_grouped .oe_kanban_group_header + height: 1% .oe_kanban_show_more clear: both text-align: center @@ -2498,9 +2501,55 @@ 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 + +// jquery ui for ie +.openerp_ie .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8') - .oe_form_field.oe_tags - float: left // }}} // @media print {{{ @@ -2542,49 +2591,7 @@ div.ui-widget-overlay background-color: black opacity: 0.6000000238418579 -// fix for ie {{{ -.openerp_ie - img - border: none - .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 - margin-right: -24px - 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 - - .label - border-bottom: 1px solid #cacaca - .arrow - span - background-color: #fefefe !important - li.oe_active - .label - border-bottom: 1px solid #729fcf - .arrow span - background-color: #729fcf !important - -// jquery ui for ie -.openerp_ie .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8') - -// }}} + // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: