From 826a6d813369070cc39216e8f11d5d09b4017757 Mon Sep 17 00:00:00 2001 From: Niko Date: Tue, 18 Dec 2012 11:59:54 +0100 Subject: [PATCH 01/12] [FIX] status bar for ie9 bzr revid: nwi@openerp.com-20121218105954-jbhhl99f126o564m --- addons/web/static/src/css/base.css | 39 ++++++++++++++++++++++++++++- addons/web/static/src/css/base.sass | 39 +++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c76403a1443..c82c28191c1 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "UTF-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -3205,3 +3205,40 @@ 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 ul.oe_form_status li, .openerp_ie ul.oe_form_status_clickable li { + display: inline-block; +} +.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; +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index bf0ff4cece4..357ff2bd1d6 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2041,6 +2041,7 @@ $sheet-padding: 16px padding-right: 14px .arrow display: none + .label color: #4c4c4c text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede @@ -2540,5 +2541,43 @@ 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') + ul.oe_form_status, ul.oe_form_status_clickable + li + display: inline-block + padding + &: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 + + + +// }}} + // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: From 8ff4af977f324b84580702fd277a5c242b15f09d Mon Sep 17 00:00:00 2001 From: Niko Date: Tue, 18 Dec 2012 12:00:52 +0100 Subject: [PATCH 02/12] [FIX] status bar for ie9 bzr revid: nwi@openerp.com-20121218110052-pufcjnp2850zbp74 --- addons/web/static/src/css/base.sass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 357ff2bd1d6..e56dde62613 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2550,9 +2550,8 @@ div.ui-widget-overlay ul.oe_form_status, ul.oe_form_status_clickable li display: inline-block - padding &:last-child - margin-right: -24px + margin-right: -24px border-right: 1px solid #cacaca .label padding-right: 14px From 83d1374321528ebf3176edc85984e64dcb3aed22 Mon Sep 17 00:00:00 2001 From: Niko Date: Tue, 18 Dec 2012 12:56:52 +0100 Subject: [PATCH 03/12] [FIX] fix color button ( modal box jquey ui) bzr revid: nwi@openerp.com-20121218115652-mkgoezb6y7yhyho4 --- addons/web/static/src/css/base.css | 5 +++++ addons/web/static/src/css/base.sass | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c82c28191c1..f983236a56e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3214,6 +3214,7 @@ div.ui-widget-overlay { } .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; @@ -3242,3 +3243,7 @@ div.ui-widget-overlay { .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 e56dde62613..648b6db132b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2550,6 +2550,7 @@ div.ui-widget-overlay 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 @@ -2573,8 +2574,10 @@ div.ui-widget-overlay 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') // }}} From aea874dac7d0e376c391a63c0f0bec6b9fd6e33f Mon Sep 17 00:00:00 2001 From: Niko Date: Tue, 18 Dec 2012 14:29:13 +0100 Subject: [PATCH 04/12] =?UTF-8?q?[FIX]=20=C2=96=C2=96Bug=20#1090982?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: nwi@openerp.com-20121218132913-66d57c4x0q6ari04 --- addons/web/static/src/css/base.css | 7 +++++++ addons/web/static/src/css/base.sass | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index f983236a56e..4e40ca62be4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1355,6 +1355,7 @@ } .openerp .oe_application { width: 100%; + height: 100%; } .openerp .oe_application a { color: #7c7bad; @@ -3212,6 +3213,12 @@ div.ui-widget-overlay { .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; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 648b6db132b..180c4e277a9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1089,6 +1089,7 @@ $sheet-padding: 16px // ActionManager {{{ .oe_application width: 100% + height: 100% a color: $link-color &:hover @@ -2546,7 +2547,11 @@ div.ui-widget-overlay img border: none .oe_topbar - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#646060', endColorstr='#262626') + 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 From b3bc0e0de70f662fd6dc05311ac16868db223468 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 09:51:59 +0100 Subject: [PATCH 05/12] [IE] see https://github.com/fgnass/spin.js/commit/1eb65a92df28675d52acbeeb33f85f2fc403c0c3 bzr revid: nwi@openerp.com-20121220085159-0dmdfit530vn01g0 --- addons/web/static/lib/spinjs/spin.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/lib/spinjs/spin.js b/addons/web/static/lib/spinjs/spin.js index d8e21786a1f..e848c55c55f 100644 --- a/addons/web/static/lib/spinjs/spin.js +++ b/addons/web/static/lib/spinjs/spin.js @@ -39,6 +39,7 @@ */ var sheet = function() { var el = createEl('style'); + var el = createEl('style', {type : 'text/css'}); ins(document.getElementsByTagName('head')[0], el); return el.sheet || el.styleSheet; }(); From 86cb1a334ff876a54fa61b5dab835dfa549aab15 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 09:56:49 +0100 Subject: [PATCH 06/12] [IE] fix oe_kanban_column bzr revid: nwi@openerp.com-20121220085649-2w7dfcldf421r1su --- addons/web_kanban/static/src/css/kanban.css | 1 + addons/web_kanban/static/src/css/kanban.sass | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 2eac8370487..bac06c2fa53 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -103,6 +103,7 @@ } .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_group_header { width: 1%; + height: 1%; } .openerp .oe_kanban_view .oe_form .oe_kanban_column { padding: 0px; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 84de3e32842..ff8feffa5d5 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -129,6 +129,7 @@ &.oe_kanban_grouped .oe_kanban_group_header width: 1% + height: 1% .oe_form .oe_kanban_column From 988b89a02ce7cdd129a5e7ee05e2be18dd6347c9 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 09:58:07 +0100 Subject: [PATCH 07/12] [IE] fix buttons problems bzr revid: nwi@openerp.com-20121220085807-qoal2n8exedp7j61 --- .bzrignore | 1 + addons/web/static/src/css/base.css | 107 +++++++++++++++------------- addons/web/static/src/css/base.sass | 99 +++++++++++++------------ 3 files changed, 111 insertions(+), 96 deletions(-) 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: From 644f4a0d14043eac00a43d945821f472a7a6a2cb Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 11:04:17 +0100 Subject: [PATCH 08/12] [IE] Fix fold cols bzr revid: nwi@openerp.com-20121220100417-g1l1i015ieuvl91y --- addons/web_kanban/static/src/css/kanban.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index df2ca01f615..510c91d916e 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -517,7 +517,7 @@ .oe_kanban_group_title_vertical -ms-writing-mode: lr-tb !important background: rgb(240, 238, 238) - top: -5px !important + top: -5px !important @media print .openerp .oe_kanban_groups From b2d9daa0090218e454f7d64390c0ab72b775dca4 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 11:36:53 +0100 Subject: [PATCH 09/12] [IE] Fix bzr revid: nwi@openerp.com-20121220103653-26nauus9awk1sojk --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c43a2ba10d2..1f0eb4639a8 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3156,6 +3156,9 @@ div.ui-widget-overlay { padding-top: 0; padding-bottom: 0; } +.openerp_ie .oe_view_manager_buttons .field_boolean { + background: white; +} .openerp_ie .oe_kanban_image { border: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5ab7332be7f..5a522b9d2d3 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2509,8 +2509,6 @@ 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 From c4e768b430cf34d8d8e40f648e3b55d1f721158a Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 12:13:28 +0100 Subject: [PATCH 10/12] [IE] Change css rules bzr revid: nwi@openerp.com-20121220111328-dxwuet3ir6fdzkw1 --- addons/web/static/src/css/base.css | 7 +++---- addons/web/static/src/css/base.sass | 5 ++--- addons/web/static/src/css/full.css | 4 ++++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1f0eb4639a8..812e3e3fd11 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1384,7 +1384,6 @@ } .openerp .oe_application { width: 100%; - height: 100%; } .openerp .oe_application a { color: #7c7bad; @@ -3128,6 +3127,9 @@ div.ui-widget-overlay { border-radius: 3px; } +.openerp_ie .oe_form_group .field_boolean input { + background: white; +} .openerp_ie input[type='checkbox'] { border: none; background: none; @@ -3156,9 +3158,6 @@ div.ui-widget-overlay { padding-top: 0; padding-bottom: 0; } -.openerp_ie .oe_view_manager_buttons .field_boolean { - background: white; -} .openerp_ie .oe_kanban_image { border: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5a522b9d2d3..41bda681246 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1112,7 +1112,6 @@ $sheet-padding: 16px // ActionManager {{{ .oe_application width: 100% - height: 100% a color: $link-color &:hover @@ -2471,6 +2470,8 @@ div.ui-widget-overlay // Internet Explorer 9+ specifics {{{ .openerp_ie + .oe_form_group .field_boolean input + background: #fff input[type='checkbox'] border: none background: none @@ -2495,8 +2496,6 @@ 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 diff --git a/addons/web/static/src/css/full.css b/addons/web/static/src/css/full.css index 2692792d46d..52616db3301 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% +} From 9a2ea2fc98f1c1807bad8cab7caf22bb27634b94 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 12:15:36 +0100 Subject: [PATCH 11/12] [MERGE] with trunk bzr revid: nwi@openerp.com-20121220111536-z8d07d11g9z2ziyv --- addons/web/static/lib/spinjs/spin.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 addons/web/static/lib/spinjs/spin.js diff --git a/addons/web/static/lib/spinjs/spin.js b/addons/web/static/lib/spinjs/spin.js old mode 100644 new mode 100755 From eac779ce356aa8e46d1f15ef2249be8d5612d9c4 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 12:20:13 +0100 Subject: [PATCH 12/12] [REVERT] remove ignore bzr revid: nwi@openerp.com-20121220112013-0lkrutijnpq4ljde --- .bzrignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.bzrignore b/.bzrignore index 3dc39eb6479..1e0564801ab 100644 --- a/.bzrignore +++ b/.bzrignore @@ -12,4 +12,3 @@ RE:^man/ RE:^lib/ RE:^addons/\w+/doc/_build/ -sa2.bat