From 0c9cae3f6a468d515125ae7feb8f01f5d66eba71 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 26 Mar 2012 14:29:50 +0200
Subject: [PATCH] [FIX] Fixed some styling issues

bzr revid: fme@openerp.com-20120326122950-m7s3t27dz1qmi8bc
---
 addons/web/static/src/css/base.css     | 8 +-------
 addons/web/static/src/css/base.sass    | 6 +-----
 addons/web/static/src/css/base_old.css | 4 ++--
 addons/web/static/src/js/view_form.js  | 6 +++---
 addons/web/static/src/xml/base.xml     | 2 +-
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c24d3bb5253..155254e734c 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -355,7 +355,7 @@
   display: none;
 }
 
-.openerp .oe_form_field_many2one td:first {
+.openerp .oe_form_field_many2one td:first-child {
   position: relative;
 }
 .openerp .oe_form_field_many2one span.oe-m2o-drop-down-button {
@@ -363,9 +363,3 @@
   top: 3px;
   right: 2px;
 }
-.openerp .oe_form_field_many2one.required input {
-  background: #d2d2ff;
-}
-.openerp .oe_form_field_many2one.required.invalid input {
-  background: #ff6666;
-}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index cb677837b99..a1cc267ff89 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -349,16 +349,12 @@ $colour4: #8a89ba
 // Transitional overrides for old styles {{{
 .openerp
     .oe_form_field_many2one
-        td:first
+        td:first-child
             position: relative
         span.oe-m2o-drop-down-button
             position: absolute
             top: 3px
             right: 2px
-        &.required input
-            background: #D2D2FF
-        &.required.invalid input
-            background: #F66
 // }}}
 
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
diff --git a/addons/web/static/src/css/base_old.css b/addons/web/static/src/css/base_old.css
index a0e1204e6b7..530b2aba89a 100644
--- a/addons/web/static/src/css/base_old.css
+++ b/addons/web/static/src/css/base_old.css
@@ -1268,10 +1268,10 @@ label.error {
     border-left: 1px solid #666;
     padding: 0 4px 0 4px;
 }
-.openerp td.required input, .openerp td.required select {
+.openerp .oe_form_required input, .openerp .oe_form_required select, .openerp .oe_form_required textarea {
     background-color: #D2D2FF !important;
 }
-.openerp td.invalid input, .openerp td.invalid select, .openerp td.invalid textarea {
+.openerp .oe_form_invalid input, .openerp .oe_form_invalid select, .openerp td.oe_form_invalid textarea {
     background-color: #F66 !important;
     border: 1px solid #D00 !important;
 }
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 758db1da1da..e0fb503aeff 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -704,7 +704,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
                     var $defaults = d.$element.find('#formview_default_fields');
                     var field_to_set = $defaults.val();
                     if (!field_to_set) {
-                        $defaults.parent().addClass('invalid');
+                        $defaults.parent().addClass('oe_form_invalid');
                         return;
                     }
                     var condition = d.$element.find('#formview_default_conditions').val(),
@@ -1505,9 +1505,9 @@ openerp.web.form.AbstractField = openerp.web.form.Widget.extend(/** @lends opene
         }
         if (!this.disable_utility_classes) {
             this.$element.toggleClass('disabled', this.get("effective_readonly"));
-            this.$element.toggleClass('required', this.required);
+            this.$element.toggleClass('oe_form_required', this.required);
             if (show_invalid) {
-                this.$element.toggleClass('invalid', !this.is_valid());
+                this.$element.toggleClass('oe_form_invalid', !this.is_valid());
             }
         }
     },
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f0494bb9380..e1e2a62eec9 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -790,7 +790,7 @@
                     Default:
                 </label>
             </td>
-            <td class="required">
+            <td class="oe_form_required">
                 <select id="formview_default_fields">
                     <option value=""/>
                     <option t-foreach="args.fields" t-as="field"