Merge lp:~openerp-dev/openerp-web/trunk-bug-1131114-ishwar into lp:openerp-web

[Ishwar Malvi(OpenERP)]

Hello,

      I have fixed a problem of share vs embed having different fields size.

Thanks,
Ishwar Malvi

Unmerged revisions

3703. By Ishwar Malvi(OpenERP) on 2013-03-18

[FIX] [General] share vs embed, different textarea size

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2013-03-26 09:04:27 +0000
+++ addons/web/static/src/css/base.css	2013-03-29 11:42:25 +0000
@@ -2366,10 +2366,13 @@
 .openerp .oe_form .oe_form_field_char input,
 .openerp .oe_form .oe_form_field_url input,
 .openerp .oe_form .oe_form_field_email input,
-.openerp .oe_form .oe_form_field_text textarea,
 .openerp .oe_form .oe_form_field_selection select {
   width: 100%;
 }
+.openerp .oe_form .oe_form_field_text textarea {
+  height: 102px;
+  width: 100%;
+}
 .openerp .oe_form .oe_form_field_text.oe_inline, .openerp .oe_form .oe_form_field_text.oe_inline > textarea {
   width: 500px;
 }
@@ -3397,6 +3400,7 @@
     overflow: hidden !important;
   }
 }
+
 .blockUI.blockOverlay {
   background-color: black;
   opacity: 0.6;

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2013-03-26 09:04:27 +0000
+++ addons/web/static/src/css/base.sass	2013-03-29 11:42:25 +0000
@@ -1876,9 +1876,11 @@
         .oe_form_field_char input,
         .oe_form_field_url input,
         .oe_form_field_email input,
-        .oe_form_field_text textarea,
         .oe_form_field_selection select
             width: 100%
+        .oe_form_field_text textarea
+            height: 102px
+            width: 100%
         .oe_form_field_text.oe_inline, .oe_form_field_text.oe_inline > textarea
             width: 500px
         h1, h2, h3, h4, h5, h6