Merge lp:~openerp-dev/openerp-web/7.0-opw-595114-msh into lp:openerp-web/7.0

Proposed by Mohammed Shekha(Open ERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/7.0-opw-595114-msh
Merge into: lp:openerp-web/7.0
Diff against target: 31 lines (+3/-3)
2 files modified
addons/web/static/src/css/base.css (+2/-2)
addons/web/static/src/css/base.sass (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-opw-595114-msh
Reviewer Review Type Date Requested Status
Martin Trigaux (OpenERP) Pending
Xavier (Open ERP) Pending
Review via email: mp+174962@code.launchpad.net

Description of the change

Hello,

Fixed the issue of padding not given, instead margin given in oe_nosheet class, due to which there is no space applied between content and border of the box model.

Demo:- Warehouse -> Traceability -> Serial Numbers -> Form view -> buttons are overrlapped by groups.

Reason: for oe_form_nosheet class we used margin which is space between Box model border and border(margin considers outside area), there should be padding which is space between box border and content.

Thanks.

To post a comment you must log in.

Unmerged revisions

3995. By Mohammed Shekha<email address hidden>

[FIX]Fixed the issue of padding not given, instead margin given in oe_nosheet class, due to which there is no space applied between content and border of the box model.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css 2013-06-27 09:17:05 +0000
+++ addons/web/static/src/css/base.css 2013-07-16 10:10:50 +0000
@@ -1,4 +1,4 @@
1@charset "utf-8";1@charset "UTF-8";
2@font-face {2@font-face {
3 font-family: "mnmliconsRegular";3 font-family: "mnmliconsRegular";
4 src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");4 src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -2114,7 +2114,7 @@
2114 width: auto;2114 width: auto;
2115}2115}
2116.openerp .oe_form_nosheet {2116.openerp .oe_form_nosheet {
2117 margin: 16px;2117 padding: 16px;
2118}2118}
2119.openerp .oe_form_nosheet > header {2119.openerp .oe_form_nosheet > header {
2120 margin: -16px -16px 0 -16px;2120 margin: -16px -16px 0 -16px;
21212121
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass 2013-06-27 09:17:05 +0000
+++ addons/web/static/src/css/base.sass 2013-07-16 10:10:50 +0000
@@ -1673,7 +1673,7 @@
1673 width: auto1673 width: auto
1674 // Sheet and padding1674 // Sheet and padding
1675 .oe_form_nosheet1675 .oe_form_nosheet
1676 margin: 16px1676 padding: 16px
1677 > header1677 > header
1678 margin: -16px -16px 0 -16px1678 margin: -16px -16px 0 -16px
1679 padding: 01679 padding: 0