Merge lp:~openerp-dev/openerp-web/saas-3-bug_1301321 into lp:~openerp/openerp-web/saas-3

Proposed by Pariket Trivedi(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/saas-3-bug_1301321
Merge into: lp:~openerp/openerp-web/saas-3
Diff against target: 43 lines (+4/-4)
2 files modified
addons/web/static/src/css/base.css (+2/-2)
addons/web/static/src/css/base.sass (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/saas-3-bug_1301321
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+219498@code.launchpad.net

Description of the change

Hello,

I have to fixed for Mass mailing: bad display of the clip image in the mail composer screen.
> change base.css

Thank you,
ptr

To post a comment you must log in.
4011. By Pariket Trivedi(OpenERP)

[IMP]: improve css class for attach button display text.

Unmerged revisions

4011. By Pariket Trivedi(OpenERP)

[IMP]: improve css class for attach button display text.

4010. By Pariket Trivedi(OpenERP)

[FIX]: bad display of the clip image in the mail composer screen.

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-09 09:36:16 +0000
3+++ addons/web/static/src/css/base.css 2014-05-15 07:16:23 +0000
4@@ -363,7 +363,7 @@
5 font-family: "entypoRegular" !important;
6 font-size: 34px;
7 font-weight: 300 !important;
8- line-height: 100%;
9+ line-height: inherit;
10 }
11 .openerp .oe_left {
12 float: left;
13@@ -2421,7 +2421,7 @@
14 width: 100%;
15 left: 2px;
16 margin: 9px 0;
17- overflow: hidden;
18+ overflow: visible;
19 }
20 .openerp .oe_fileupload .oe_add button {
21 display: inline;
22
23=== modified file 'addons/web/static/src/css/base.sass'
24--- addons/web/static/src/css/base.sass 2014-04-09 09:36:16 +0000
25+++ addons/web/static/src/css/base.sass 2014-05-15 07:16:23 +0000
26@@ -381,7 +381,7 @@
27 font-family: "entypoRegular" !important
28 font-size: 34px
29 font-weight: 300 !important
30- line-height: 100%
31+ line-height: inherit
32 .oe_left
33 float: left
34 margin-right: 8px
35@@ -1968,7 +1968,7 @@
36 width: 100%
37 left: +2px
38 margin: 9px 0 /* Customize margin according bootstrap3 */
39- overflow: hidden
40+ overflow: visible
41 button
42 display: inline
43 height: 24px

Subscribers

People subscribed via source and target branches