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
1=== modified file 'addons/web/static/src/css/base.css'
2--- addons/web/static/src/css/base.css 2013-06-27 09:17:05 +0000
3+++ addons/web/static/src/css/base.css 2013-07-16 10:10:50 +0000
4@@ -1,4 +1,4 @@
5-@charset "utf-8";
6+@charset "UTF-8";
7 @font-face {
8 font-family: "mnmliconsRegular";
9 src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
10@@ -2114,7 +2114,7 @@
11 width: auto;
12 }
13 .openerp .oe_form_nosheet {
14- margin: 16px;
15+ padding: 16px;
16 }
17 .openerp .oe_form_nosheet > header {
18 margin: -16px -16px 0 -16px;
19
20=== modified file 'addons/web/static/src/css/base.sass'
21--- addons/web/static/src/css/base.sass 2013-06-27 09:17:05 +0000
22+++ addons/web/static/src/css/base.sass 2013-07-16 10:10:50 +0000
23@@ -1673,7 +1673,7 @@
24 width: auto
25 // Sheet and padding
26 .oe_form_nosheet
27- margin: 16px
28+ padding: 16px
29 > header
30 margin: -16px -16px 0 -16px
31 padding: 0