Merge lp:~openerp-dev/openerp-web/7.0-bug-1091197-priyank into lp:openerp-web/7.0

Proposed by Priyank Pandya(OpenERP Trainee)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/7.0-bug-1091197-priyank
Merge into: lp:openerp-web/7.0
Diff against target: 60 lines (+12/-2)
2 files modified
addons/web/static/src/css/base.css (+7/-1)
addons/web/static/src/css/base.sass (+5/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-bug-1091197-priyank
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+156817@code.launchpad.net

Description of the change

Hello,

Improve the view of check box in edit mode by removing uncessary border [IE9] and also change the color of drop down arrow from blue to black.

Thanks

To post a comment you must log in.

Unmerged revisions

3871. By Priyank Pandya(OpenERP Trainee)

[FiX] checkboxes in editable lines don't look right (border visible)[IE9]

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-03-21 16:47:41 +0000
3+++ addons/web/static/src/css/base.css 2013-04-03 11:49:51 +0000
4@@ -560,6 +560,9 @@
5 font-style: italic;
6 text-decoration: none;
7 }
8+.openerp .oe_tags .text-core .text-wrap .text-arrow {
9+ background: url("/web/static/src/img/down-arrow.png") 50% 50% no-repeat;
10+}
11 .openerp.oe_tooltip {
12 font-size: 12px;
13 }
14@@ -2822,7 +2825,7 @@
15 min-width: 0;
16 max-width: none;
17 }
18-.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea {
19+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea {
20 height: 27px;
21 -moz-border-radius: 0;
22 -webkit-border-radius: 0;
23@@ -2830,6 +2833,9 @@
24 border: 1px solid #aaaaff;
25 margin: 0;
26 }
27+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field checkbox {
28+ border: none;
29+}
30 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field select {
31 min-width: 0;
32 }
33
34=== modified file 'addons/web/static/src/css/base.sass'
35--- addons/web/static/src/css/base.sass 2013-03-21 16:47:41 +0000
36+++ addons/web/static/src/css/base.sass 2013-04-03 11:49:51 +0000
37@@ -493,6 +493,8 @@
38 .text-core .text-wrap .text-dropdown .text-list .text-suggestion em
39 font-style: italic
40 text-decoration: none
41+ .text-core .text-wrap .text-arrow
42+ background: url("/web/static/src/img/down-arrow.png")50% 50% no-repeat
43 margin-bottom: 1px
44 // }}}
45 // Tooltips {{{
46@@ -2223,11 +2225,13 @@
47 .oe_form_field
48 min-width: 0
49 max-width: none
50- input, textarea
51+ textarea,
52 height: $row-height
53 @include radius(0)
54 border: 1px solid #aaf
55 margin: 0
56+ input, checkbox
57+ border: none
58 input, textarea, select
59 min-width: 0
60 &.oe_form_field_float,&.oe_form_view_integer