Merge lp:~openerp-dev/openerp-web/trunk-mail-improvement-kjo into lp:openerp-web

Proposed by Thibault Delavallée (OpenERP)
Status: Merged
Merged at revision: 3981
Proposed branch: lp:~openerp-dev/openerp-web/trunk-mail-improvement-kjo
Merge into: lp:openerp-web
Diff against target: 25 lines (+2/-2)
2 files modified
addons/web/static/src/css/base.css (+1/-1)
addons/web/static/src/css/base.sass (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-mail-improvement-kjo
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+214893@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 2014-04-07 16:17:28 +0000
3+++ addons/web/static/src/css/base.css 2014-04-09 07:52:35 +0000
4@@ -612,7 +612,7 @@
5 display: inline-block;
6 height: 12px;
7 width: 12px;
8- vertical-align: bottom;
9+ vertical-align: top;
10 border-radius: 10px;
11 margin: 1px 0;
12 }
13
14=== modified file 'addons/web/static/src/css/base.sass'
15--- addons/web/static/src/css/base.sass 2014-04-07 16:17:28 +0000
16+++ addons/web/static/src/css/base.sass 2014-04-09 07:52:35 +0000
17@@ -545,7 +545,7 @@
18 display: inline-block
19 height: 12px
20 width: 12px
21- vertical-align: bottom
22+ vertical-align: top
23 border-radius: 10px
24 margin: 1px 0
25 &.oe_form_invalid