Merge lp:~openerp-dev/openerp-web/7.0-bug-1097738-bth into lp:openerp-web/7.0

Proposed by Bhumi Thakkar (Open ERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/7.0-bug-1097738-bth
Merge into: lp:openerp-web/7.0
Diff against target: 59 lines (+11/-4) (has conflicts)
3 files modified
addons/web/static/src/css/base.css (+1/-1)
addons/web/static/src/css/base.sass (+2/-3)
addons/web_kanban/static/src/css/kanban.sass (+8/-0)
Text conflict in addons/web_kanban/static/src/css/kanban.sass
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-bug-1097738-bth
Reviewer Review Type Date Requested Status
Fabien Meghazi (OpenERP) (community) Needs Fixing
Bhumi Thakkar (Open ERP) (community) Needs Resubmitting
Review via email: mp+143238@code.launchpad.net

Description of the change

Hello,

   Fix: fields.html required: background not blue

To Reproduce:
1.Messaging => Inbox => click on compose a new message button
2. Give required="1' to body field which has type="html"

Observed: body field should have background blue as it is required field.

Thanks.

To post a comment you must log in.
Revision history for this message
Fabien Meghazi (OpenERP) (fme) wrote :

Could you put your declaration in the same block as the already existant oe_form_required declaration ?

Eg:
.oe_form_required
    input:not([disabled]):not([readonly]), select:not([disabled]):not([readonly]),
textarea:not([disabled]):not([readonly]), &.oe_form_required iframe
        background-color: #D2D2FF !important

While you are at it, could you put a saas variable for the required color #D2D2FF (also used in editable list)

review: Needs Fixing
3703. By Bhumi Thakkar (Open ERP)

[IMP] Improve code.

Revision history for this message
Bhumi Thakkar (Open ERP) (bth-openerp) wrote :

Improve code as per your suggestion.

> Could you put your declaration in the same block as the already existant
> oe_form_required declaration ?
>
> Eg:
> .oe_form_required
> input:not([disabled]):not([readonly]),
> select:not([disabled]):not([readonly]),
> textarea:not([disabled]):not([readonly]), &.oe_form_required iframe
> background-color: #D2D2FF !important
>
> While you are at it, could you put a saas variable for the required color
> #D2D2FF (also used in editable list)

review: Needs Resubmitting
Revision history for this message
Fabien Meghazi (OpenERP) (fme) wrote :

You forgot the saas variable. Check my previous comment.

Please, also merge with 7.0 and check the conflict

review: Needs Fixing

Unmerged revisions

3703. By Bhumi Thakkar (Open ERP)

[IMP] Improve code.

3702. By Bhumi Thakkar (Open ERP)

[FIX] blue color for requied in html field.--fixes:lp1097738

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-02-18 11:08:02 +0000
3+++ addons/web/static/src/css/base.css 2013-02-19 05:54:21 +0000
4@@ -2381,7 +2381,7 @@
5 .openerp .oe_form .oe_datepicker_root {
6 display: inline-block;
7 }
8-.openerp .oe_form .oe_form_required input:not([disabled]):not([readonly]), .openerp .oe_form .oe_form_required select:not([disabled]):not([readonly]), .openerp .oe_form .oe_form_required textarea:not([disabled]):not([readonly]) {
9+.openerp .oe_form .oe_form_required input:not([disabled]):not([readonly]), .openerp .oe_form .oe_form_required select:not([disabled]):not([readonly]), .openerp .oe_form .oe_form_required textarea:not([disabled]):not([readonly]), .openerp .oe_form .oe_form_field_html.oe_form_required iframe {
10 background-color: #d2d2ff !important;
11 }
12 .openerp .oe_form .oe_form_invalid input, .openerp .oe_form .oe_form_invalid select, .openerp .oe_form .oe_form_invalid textarea {
13
14=== modified file 'addons/web/static/src/css/base.sass'
15--- addons/web/static/src/css/base.sass 2013-02-18 11:08:02 +0000
16+++ addons/web/static/src/css/base.sass 2013-02-19 05:54:21 +0000
17@@ -1883,7 +1883,7 @@
18 .oe_datepicker_root
19 display: inline-block
20 .oe_form_required
21- input:not([disabled]):not([readonly]), select:not([disabled]):not([readonly]), textarea:not([disabled]):not([readonly])
22+ input:not([disabled]):not([readonly]), select:not([disabled]):not([readonly]), textarea:not([disabled]):not([readonly]), .oe_form_field_html.oe_form_required iframe
23 background-color: #D2D2FF !important
24 .oe_form_invalid
25 input, select, textarea
26@@ -1920,8 +1920,7 @@
27 margin-left: 130px
28 margin-top: 32px
29 margin-bottom: 32px
30- text-align: justify
31-
32+ text-align: justify
33 .oe_form_editable
34 .oe_form
35 .oe_form_field_integer input
36
37=== modified file 'addons/web_kanban/static/src/css/kanban.sass'
38--- addons/web_kanban/static/src/css/kanban.sass 2013-01-30 12:07:11 +0000
39+++ addons/web_kanban/static/src/css/kanban.sass 2013-02-19 05:54:21 +0000
40@@ -127,11 +127,19 @@
41 text-overflow: ellipsis
42 .oe_fold_column
43 .oe_kanban_group_length
44+<<<<<<< TREE
45 position: absolute
46 top: -1px
47 right: -14px
48 float: right
49 display: block
50+=======
51+ position: absolute
52+ top: -1px
53+ right: -14px
54+ text-align: center
55+ float: right
56+>>>>>>> MERGE-SOURCE
57 &.oe_kanban_grouped
58 .oe_kanban_column, .oe_kanban_group_header
59 width: 185px