[MERGE] Merge with trunk upto revision no 1400.

[odoo/odoo.git] / addons / web / static / src / css / base.css

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 88d419c..3430dfe 100644 (file)
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -846,7 +846,7 @@ label.error {
 .openerp .oe_frame.oe_forms {
     clear: both;
 }
-.openerp table.oe_frame td {
+.openerp table.oe_frame {
     color: #4c4c4c;
 }
 .openerp td.oe_form_frame_cell {
@@ -874,7 +874,6 @@ label.error {
 }
 
 .openerp .oe_forms label.oe_label, .openerp .oe_forms label.oe_label_help {
-    text-align: right;
     margin: 3px 0 0 10px;
 }
 .openerp label.oe_label_help span {
@@ -885,6 +884,18 @@ label.error {
     top: -4px;
     padding: 0 2px;
 }
+.openerp .oe_align_left {
+    text-align: left;
+}
+.openerp .oe_align_right {
+    text-align: right;
+}
+.openerp .oe_align_center {
+    text-align: center;
+}
+.openerp .oe_forms .oe_form_paragraph {
+    margin: 3px 0 0 0;
+}
 
 /* Inputs */
 .openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms textarea {