Merge lp:~openerp-dev/openerp-web/7.0-fix-1166716-chm into lp:openerp-web/7.0

Proposed by Christophe Matthieu (OpenERP)
Status: Merged
Merged at revision: 3988
Proposed branch: lp:~openerp-dev/openerp-web/7.0-fix-1166716-chm
Merge into: lp:openerp-web/7.0
Diff against target: 36 lines (+5/-7)
2 files modified
addons/web/static/src/css/base.css (+3/-3)
addons/web/static/src/css/base.sass (+2/-4)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-fix-1166716-chm
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+171963@code.launchpad.net
To post a comment you must log in.

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-07 16:03:07 +0000
3+++ addons/web/static/src/css/base.css 2013-06-28 08:01:25 +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@@ -2890,8 +2890,8 @@
11 margin: 0 !important;
12 padding: 0;
13 }
14-.openerp .oe_list .oe_form .oe_form_field_boolean {
15- padding: 1px 6px 3px;
16+.openerp .oe_list .oe_form .oe_form_field_boolean input {
17+ margin: 1px 0 0 10px !important;
18 }
19 .openerp .oe_list .oe_list_content .oe_group_header {
20 background-color: #ededed;
21
22=== modified file 'addons/web/static/src/css/base.sass'
23--- addons/web/static/src/css/base.sass 2013-06-07 16:03:07 +0000
24+++ addons/web/static/src/css/base.sass 2013-06-28 08:01:25 +0000
25@@ -2285,10 +2285,8 @@
26 position: absolute
27 margin: 0 !important // dammit
28 padding: 0
29- .oe_form_field_boolean
30- // use padding similar to actual cell to correctly position the
31- // checkbox
32- padding: 1px 6px 3px
33+ .oe_form_field_boolean input
34+ margin: 1px 0 0 10px !important
35 .oe_list_content .oe_group_header
36 @include vertical-gradient(#fcfcfc, #dedede)
37