From b2045b91acc8e85bb053ca324099f210c79944f9 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Fri, 28 Feb 2014 14:52:24 +0100
Subject: [IMP] Improve dipslay of form_embedded_html for mail Template.
 Removed the big margin, and add scroll on overflow

bzr revid: jke@openerp.com-20140228135224-my13sabs7f7h3c60
---
 addons/web/static/src/css/base.css  | 9 ++++-----
 addons/web/static/src/css/base.sass | 7 +++----
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index e43a2fb654e..16723695743 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -2339,10 +2339,9 @@
 }
 .openerp .oe_form .oe_form_embedded_html {
   position: relative;
-  width: 600px;
-  margin-left: 130px;
-  margin-top: 32px;
-  margin-bottom: 32px;
+  width: 100%;
+  margin: auto;
+  overflow: scroll;
   text-align: justify;
 }
 .openerp .oe_form .oe_form_field_html .oe_input_icon {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b19db9e4ebd..50ceffa3a05 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1893,10 +1893,9 @@ $sheet-padding: 16px
                 overflow: hidden
         .oe_form_embedded_html
             position: relative
-            width: 600px
-            margin-left: 130px
-            margin-top: 32px
-            margin-bottom: 32px
+            width: 100%
+            margin: auto
+            overflow: scroll            
             text-align: justify
         .oe_form_field_html .oe_input_icon
             float: right
-- 
cgit v1.2.3


From bd90911698a5e51ed7751d663009384d5724d562 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Wed, 5 Mar 2014 15:28:49 +0100
Subject: [FIX] Replace overflow scroll into overflow auto by default

bzr revid: jke@openerp.com-20140305142849-5ustm55y0qp4k5hm
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src/css')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 16723695743..6a20442ed41 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2341,7 +2341,7 @@
   position: relative;
   width: 100%;
   margin: auto;
-  overflow: scroll;
+  overflow: auto;
   text-align: justify;
 }
 .openerp .oe_form .oe_form_field_html .oe_input_icon {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 50ceffa3a05..38a47eed1c5 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1895,7 +1895,7 @@ $sheet-padding: 16px
             position: relative
             width: 100%
             margin: auto
-            overflow: scroll            
+            overflow: auto            
             text-align: justify
         .oe_form_field_html .oe_input_icon
             float: right
-- 
cgit v1.2.3