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

Proposed by Priyank Pandya(OpenERP Trainee)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/trunk-bug-1091197-priyank
Merge into: lp:openerp-web
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/trunk-bug-1091197-priyank
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+151177@code.launchpad.net

This proposal supersedes a proposal from 2013-02-25.

Description of the change

Hello,

[IE9] checkboxes in editable lines don't look right (border visible)
change the check box view in edit mode in IE9 and additionally change the drop-down color to black in place of blue in edit mode.

Thanks.

To post a comment you must log in.

Unmerged revisions

3686. By Priyank Pandya(OpenERP Trainee)

[FIX]Improve the view of checkbox in edit mode in IE9 and change color of dropdown in edit mode.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css 2013-02-24 09:46:16 +0000
+++ addons/web/static/src/css/base.css 2013-03-01 10:12:20 +0000
@@ -554,6 +554,9 @@
554 font-style: italic;554 font-style: italic;
555 text-decoration: none;555 text-decoration: none;
556}556}
557.openerp .oe_tags .text-core .text-wrap .text-arrow {
558 background: url("/web/static/src/img/down-arrow.png") 50% 50% no-repeat;
559}
557.openerp.oe_tooltip {560.openerp.oe_tooltip {
558 font-size: 12px;561 font-size: 12px;
559}562}
@@ -2788,7 +2791,7 @@
2788 min-width: 0;2791 min-width: 0;
2789 max-width: none;2792 max-width: none;
2790}2793}
2791.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea {2794.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea {
2792 height: 27px;2795 height: 27px;
2793 -moz-border-radius: 0;2796 -moz-border-radius: 0;
2794 -webkit-border-radius: 0;2797 -webkit-border-radius: 0;
@@ -2796,6 +2799,9 @@
2796 border: 1px solid #aaaaff;2799 border: 1px solid #aaaaff;
2797 margin: 0;2800 margin: 0;
2798}2801}
2802.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field checkbox {
2803 border: none;
2804}
2799.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 {2805.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 {
2800 min-width: 0;2806 min-width: 0;
2801}2807}
28022808
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass 2013-02-24 09:46:16 +0000
+++ addons/web/static/src/css/base.sass 2013-03-01 10:12:20 +0000
@@ -487,6 +487,8 @@
487 .text-core .text-wrap .text-dropdown .text-list .text-suggestion em487 .text-core .text-wrap .text-dropdown .text-list .text-suggestion em
488 font-style: italic488 font-style: italic
489 text-decoration: none489 text-decoration: none
490 .text-core .text-wrap .text-arrow
491 background: url("/web/static/src/img/down-arrow.png")50% 50% no-repeat
490 margin-bottom: 1px492 margin-bottom: 1px
491 // }}}493 // }}}
492 // Tooltips {{{494 // Tooltips {{{
@@ -2197,11 +2199,13 @@
2197 .oe_form_field2199 .oe_form_field
2198 min-width: 02200 min-width: 0
2199 max-width: none2201 max-width: none
2200 input, textarea2202 textarea,
2201 height: $row-height2203 height: $row-height
2202 @include radius(0)2204 @include radius(0)
2203 border: 1px solid #aaf2205 border: 1px solid #aaf
2204 margin: 02206 margin: 0
2207 input, checkbox
2208 border: none
2205 input, textarea, select2209 input, textarea, select
2206 min-width: 02210 min-width: 0
2207 &.oe_form_field_float,&.oe_form_view_integer2211 &.oe_form_field_float,&.oe_form_view_integer