[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.

bzr revid: bth@tinyerp.com-20130829063717-t8kqjombb25gqmsb

2 files changed, 66 insertions, 11 deletions

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 00d3127e286..410f4849d06 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -1,4 +1,22 @@
 @charset "utf-8";
+/* ---- CKEditor Minimal Reset ---- */
+.navbar.navbar-inverse .cke_chrome {
+  border: none;
+}
+
+.navbar.navbar-inverse .cke_inner {
+  background: transparent;
+}
+
+.navbar.navbar-inverse .cke_top {
+  background: transparent;
+  border: none;
+  box-shadow: none;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+}
+
+/* ---- OpenERP Style ---- */
 .oe_hidden {
   display: none !important;
 }
@@ -215,12 +233,13 @@
   left: 0px;
 }
 
-/* ---- MOBILE PREVIEW ---- */
+/* ---- MODAL DIALOGS ---- */
 .oe_stop_scrolling {
   height: 100%;
   overflow: hidden;
 }
 
+/* ---- MOBILE PREVIEW ---- */
 .oe_mobile_preview.modal {
   height: 660px;
   background-color: black;
@@ -269,11 +288,19 @@
   opacity: 1;
 }
 
+/* ---- SEO TOOLS ---- */
+.oe_seo_configuration {
+  min-width: 42em;
+}
+.oe_seo_configuration .modal-body {
+  max-height: inherit;
+  min-height: 27em;
+}
 .oe_seo_configuration input {
-  width: inherit;
+  width: 90%;
 }
 .oe_seo_configuration textarea {
-  width: inherit;
+  width: 90%;
 }
 .oe_seo_configuration ul {
   list-style: none;
@@ -283,9 +310,10 @@
 }
 
 .oe_seo_keywords_list {
-  width: 39em;
+  width: 100%;
+  margin: 0.1em;
 }
 .oe_seo_keywords_list li {
   float: left;
-  width: 12em;
+  width: 19em;
 }
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index c75946d7c6b..74885a380ee 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -1,5 +1,22 @@
 @charset "utf-8"
 
+/* ---- CKEditor Minimal Reset ---- */
+
+.navbar.navbar-inverse .cke_chrome
+    border: none
+
+.navbar.navbar-inverse .cke_inner
+    background: transparent
+
+.navbar.navbar-inverse .cke_top
+    background: transparent
+    border: none
+    box-shadow: none
+    -webkit-box-shadow: none
+    -moz-box-shadow: none
+
+/* ---- OpenERP Style ---- */
+
 .oe_hidden
     display: none !important
 
@@ -186,12 +203,14 @@
 .oe_handle.nw,.oe_handle.w,.oe_handle.sw
     left: 0px
 
-/* ---- MOBILE PREVIEW ---- */
+/* ---- MODAL DIALOGS ---- */
 
 .oe_stop_scrolling
     height: 100%
     overflow: hidden
 
+/* ---- MOBILE PREVIEW ---- */
+
 $mobile_preview_background: #000000
 $mobile_preview_border: #1A1A1A
 $icon_close: #E00101
@@ -236,18 +255,26 @@ $icon_close: #E00101
         color: $icon_close
         opacity: 1
 
+/* ---- SEO TOOLS ---- */
+
+$remove_color: $icon_close
 .oe_seo_configuration
+    min-width: 42em
+    .modal-body
+        max-height: inherit
+        min-height: 27em
     input
-        width: inherit
+        width: 90%
     textarea
-        width: inherit
+        width: 90%
     ul
         list-style: none
     .oe_remove
-        color: $icon_close
+        color: $remove_color
 
 .oe_seo_keywords_list
-    width: 39em
+    width: 100%
+    margin: 0.1em
     li
         float: left
-        width: 12em
\ No newline at end of file
+        width: 19em