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

[Bhumi Thakkar (Open ERP)]

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.

[Fabien Meghazi (OpenERP) (fme)]

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

[lp:~openerp-dev/openerp-web/7.0-bug-1097738-bth]

3703. By Bhumi Thakkar (Open ERP) on 2013-02-19

[IMP] Improve code.

[Bhumi Thakkar (Open ERP) (bth-openerp)]

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

[Fabien Meghazi (OpenERP) (fme)]

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) on 2013-02-19

[IMP] Improve code.

3702. By Bhumi Thakkar (Open ERP) on 2013-01-15

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

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2013-02-18 11:08:02 +0000
+++ addons/web/static/src/css/base.css	2013-02-19 05:54:21 +0000
@@ -2381,7 +2381,7 @@
 .openerp .oe_form .oe_datepicker_root {
   display: inline-block;
 }
-.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_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 {
   background-color: #d2d2ff !important;
 }
 .openerp .oe_form .oe_form_invalid input, .openerp .oe_form .oe_form_invalid select, .openerp .oe_form .oe_form_invalid textarea {

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2013-02-18 11:08:02 +0000
+++ addons/web/static/src/css/base.sass	2013-02-19 05:54:21 +0000
@@ -1883,7 +1883,7 @@
         .oe_datepicker_root
             display: inline-block
         .oe_form_required
-            input:not([disabled]):not([readonly]), select:not([disabled]):not([readonly]), textarea:not([disabled]):not([readonly])
+            input:not([disabled]):not([readonly]), select:not([disabled]):not([readonly]), textarea:not([disabled]):not([readonly]), .oe_form_field_html.oe_form_required iframe 
                 background-color: #D2D2FF !important
         .oe_form_invalid
             input, select, textarea
@@ -1920,8 +1920,7 @@
             margin-left: 130px
             margin-top: 32px
             margin-bottom: 32px
-            text-align: justify
-
+            text-align: justify  
     .oe_form_editable
         .oe_form
             .oe_form_field_integer input

=== modified file 'addons/web_kanban/static/src/css/kanban.sass'
--- addons/web_kanban/static/src/css/kanban.sass	2013-01-30 12:07:11 +0000
+++ addons/web_kanban/static/src/css/kanban.sass	2013-02-19 05:54:21 +0000
@@ -127,11 +127,19 @@
             text-overflow: ellipsis
     .oe_fold_column
         .oe_kanban_group_length
+<<<<<<< TREE
           position: absolute
           top: -1px
           right: -14px
           float: right
           display: block
+=======
+            position: absolute
+            top: -1px
+            right: -14px
+            text-align: center
+            float: right
+>>>>>>> MERGE-SOURCE
     &.oe_kanban_grouped
         .oe_kanban_column, .oe_kanban_group_header
             width: 185px