Merged trunk-website-ace-ddm

bzr revid: ddm@openerp.com-20130910135801-wlp5u4zvna2q5228

4 files changed, 20 insertions, 13 deletions

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 5b20d85c69f..a2f322f1b84 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -106,13 +106,18 @@ table.editorbar-panel td.selected {
   left: 0px;
   right: 0px;
   bottom: 0px;
-  max-height: 280px;
-  min-height: 140px;
   background: #282828;
   box-shadow: 0px 10px 10px -10px black inset;
   overflow-y: auto;
   z-index: 100;
 }
+.oe_snippets .nav-pills {
+  padding: 3px 8px;
+  background: #444444;
+}
+.oe_snippets .nav-pills > li > a {
+  padding: 2px 10px !important;
+}
 
 .oe_snippet {
   display: inline-block;
@@ -121,10 +126,10 @@ table.editorbar-panel td.selected {
   width: 120px;
   height: 120px;
   border-radius: 3px;
-  margin: 10px;
+  margin: 8px;
   margin-right: 0px;
   position: relative;
-  box-shadow: 0px 3px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.2);
   overflow: hidden;
   -webkit-user-select: none;
   user-select: none;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index e4edcd3c62e..8c32d4222f5 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -98,12 +98,15 @@ table.editorbar-panel
     left: 0px
     right: 0px
     bottom: 0px
-    max-height: 280px
-    min-height: 140px
     background: rgb(40,40,40)
     box-shadow: 0px 10px 10px -10px black inset
     overflow-y: auto
     z-index: 100
+    .nav-pills
+        padding: 3px 8px
+        background: #444
+        > li > a
+            padding: 2px 10px !important
 
 .oe_snippet
     display: inline-block
@@ -112,10 +115,10 @@ table.editorbar-panel
     width: 120px
     height: 120px
     border-radius: 3px
-    margin: 10px
+    margin: 8px
     margin-right: 0px
     position: relative
-    box-shadow: 0px 3px 10px rgba(0,0,0,0.2)
+    box-shadow: 0px 3px 8px rgba(0,0,0,0.2)
     overflow: hidden
     -webkit-user-select: none
     user-select: none
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 3c8aee57ef2..77db53b45e9 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -193,6 +193,8 @@ a[data-publish][data-publish='on']:hover .css_published {
 [data-publish]:not(a) {
   position: relative;
   overflow: visible;
+  /*&:hover > [data-publish] */
+  /*     display: block */
 }
 [data-publish]:not(a) > [data-publish] {
   position: absolute;
@@ -200,6 +202,3 @@ a[data-publish][data-publish='on']:hover .css_published {
   top: -10px;
   display: none;
 }
-[data-publish]:not(a):hover > [data-publish] {
-  display: block;
-}
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index b5468a4b0e8..9992a8586ef 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -156,5 +156,5 @@ a[data-publish]
         right: -6px
         top: -10px
         display: none
-    &:hover > [data-publish]
-        display: block
\ No newline at end of file
+    /*&:hover > [data-publish]*/
+    /*     display: block*/
\ No newline at end of file