From 1ca85cf20e60ca9efa802789c28ffe74d7e4659b Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 19 Jun 2012 16:07:24 +0200 Subject: [PATCH 1/2] fix groups bzr revid: al@openerp.com-20120619140724-2k5pxakw99emft7y --- addons/web/static/src/css/base.css | 3 ++- addons/web/static/src/css/base.sass | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 23f91aec952..dc211a93c36 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"); @@ -1768,6 +1768,7 @@ padding-left: 8px; } .openerp .oe_form .oe_form_group { + width: 100%; margin: 5px 0px 5px 0px; } .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b63995b3e87..f0d0c4ba155 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1407,6 +1407,7 @@ $colour4: #8a89ba td.oe_form_group_cell + .oe_form_group_cell padding-left: 8px .oe_form_group + width: 100% margin: 5px 0px 5px 0px // }}} // FormView.label {{{ From 2f2dcd29d0c37cd7bc80b7ce4c622fd3510e18eb Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 19 Jun 2012 16:21:09 +0200 Subject: [PATCH 2/2] fix notebook in sheet bzr revid: al@openerp.com-20120619142109-9q269mjhus62ads6 --- addons/web/static/src/css/base.css | 7 +++++-- addons/web/static/src/css/base.sass | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index dc211a93c36..024ecbbb965 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1755,6 +1755,9 @@ .openerp .oe_application .oe_form_sheet .ui-tabs { margin: 0 -16px; } +.openerp .oe_application .oe_form_sheet .oe_notebook_page { + padding: 0 16px; +} .openerp .oe_form td.oe_form_group_cell_label { border-right: 1px solid #dddddd; padding: 2px 0px 2px 0px; @@ -1769,7 +1772,7 @@ } .openerp .oe_form .oe_form_group { width: 100%; - margin: 5px 0px 5px 0px; + margin: 4px 0 4px 0; } .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { font-weight: bold; @@ -1790,7 +1793,7 @@ .openerp .oe_horizontal_separator { font-weight: bold; font-size: 20px; - margin: 20px 0px 10px 0px; + margin: 8px 0px 8px 0px; color: #aaaabb; } .openerp .oe_horizontal_separator:empty { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f0d0c4ba155..1d092ef041e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1394,6 +1394,8 @@ $colour4: #8a89ba @include box-shadow(0 0 10px rgba(0,0,0,0.3)) .ui-tabs margin: 0 -16px + .oe_notebook_page + padding: 0 16px // }}} // FormView.group {{{ .oe_form @@ -1408,7 +1410,7 @@ $colour4: #8a89ba padding-left: 8px .oe_form_group width: 100% - margin: 5px 0px 5px 0px + margin: 4px 0 4px 0 // }}} // FormView.label {{{ .oe_form @@ -1430,7 +1432,7 @@ $colour4: #8a89ba .oe_horizontal_separator font-weight: bold font-size: 20px - margin: 20px 0px 10px 0px + margin: 8px 0px 8px 0px color: #aab .oe_horizontal_separator:empty height: 5px