[MERGE]with trunk.

bzr revid: ima@tinyerp.com-20131021124222-7j3xc1ahtek5gyuw

2 files changed, 24 insertions, 53 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 97bbb2b207c..87e129bb211 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -700,10 +700,8 @@
 .openerp .oe_dropdown_menu {
   display: none;
   position: absolute;
-  top: 26px;
   z-index: 3;
   margin: 0;
-  padding: 0;
   border: 1px solid #afafb6;
   background: white;
   padding: 4px 0;
@@ -1116,7 +1114,7 @@
   border-color: #999999;
   border-color: rgba(0, 0, 0, 0.2);
   border-style: solid;
-  border-width: 0 1px 1px;
+  border-width: 0 2px 1px;
   -moz-border-radius: 0 0 6px 6px;
   -webkit-border-radius: 0 0 6px 6px;
   border-radius: 0 0 6px 6px;
@@ -1455,7 +1453,7 @@
   display: table-row;
   height: inherit;
 }
-.openerp .oe_view_manager .oe_view_manager_view_kanban {
+.openerp .oe_view_manager .oe_view_manager_view_kanban:not(:empty) {
   height: inherit;
 }
 .openerp .oe_view_manager table.oe_view_manager_header {
@@ -2736,31 +2734,20 @@
   -o-transform: rotate(45deg);
   transform: rotate(45deg);
 }
-.openerp ul.oe_form_status .oe_folded .label, .openerp ul.oe_form_status_clickable .oe_folded .label {
-  padding-bottom: 8px;
-}
-.openerp ul.oe_form_status .oe_folded ul, .openerp ul.oe_form_status_clickable .oe_folded ul {
-  position: absolute;
-  border-top: 1px solid #cacaca;
-  float: none;
-  top: 30px;
-  right: 0;
+.openerp ul.oe_form_status ul.oe_dropdown_menu, .openerp ul.oe_form_status_clickable ul.oe_dropdown_menu {
   display: none;
+  padding: 0;
+  min-width: 0;
 }
-.openerp ul.oe_form_status .oe_folded ul li, .openerp ul.oe_form_status_clickable .oe_folded ul li {
-  margin: 0;
-  border-left: 1px solid #cacaca;
+.openerp ul.oe_form_status ul.oe_dropdown_menu.oe_opened, .openerp ul.oe_form_status_clickable ul.oe_dropdown_menu.oe_opened {
   display: block;
 }
-.openerp ul.oe_form_status .oe_folded ul li.label, .openerp ul.oe_form_status_clickable .oe_folded ul li.label {
-  border: 0;
-  padding-left: 24px;
-}
-.openerp ul.oe_form_status .oe_folded ul li:last-child, .openerp ul.oe_form_status_clickable .oe_folded ul li:last-child {
-  border-bottom: 1px solid #cacaca;
+.openerp ul.oe_form_status ul.oe_dropdown_menu li, .openerp ul.oe_form_status_clickable ul.oe_dropdown_menu li {
+  margin: 0;
+  width: 100%;
 }
-.openerp ul.oe_form_status .oe_folded:hover ul, .openerp ul.oe_form_status_clickable .oe_folded:hover ul {
-  display: block;
+.openerp ul.oe_form_status ul.oe_dropdown_menu li span.label, .openerp ul.oe_form_status_clickable ul.oe_dropdown_menu li span.label {
+  padding-left: 14px;
 }
 .openerp ul.oe_form_status li.oe_active, .openerp ul.oe_form_status_clickable li.oe_active {
   background-color: #5382b9;
@@ -3211,9 +3198,6 @@
 }
 
 @-moz-document url-prefix() {
-  .openerp .oe_view_manager .oe_view_manager_switch li {
-    line-height: 21px;
-  }
   .openerp .oe_searchview .oe_searchview_search {
     top: -1px;
   }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e41a182407d..e8eab4544a6 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -606,10 +606,8 @@ $sheet-padding: 16px
     .oe_dropdown_menu
         display: none
         position: absolute
-        top: 26px
         z-index: 3
         margin: 0
-        padding: 0
         border: 1px solid $tag-border
         background: white
         padding: 4px 0
@@ -914,7 +912,7 @@ $sheet-padding: 16px
             border-color: #999
             border-color: rgba(0, 0, 0, 0.2)
             border-style: solid
-            border-width: 0 1px 1px
+            border-width: 0 2px 1px
             @include radius(0 0 6px 6px)
             @include background-clip()
             li
@@ -1171,7 +1169,7 @@ $sheet-padding: 16px
         .oe_view_manager_body
             display: table-row
             height: inherit
-        .oe_view_manager_view_kanban
+        .oe_view_manager_view_kanban:not(:empty)
             height: inherit
 
         table.oe_view_manager_header
@@ -2174,27 +2172,18 @@ $sheet-padding: 16px
                     @include skew-gradient(#fcfcfc, #dedede)
                     @include radius(3px)
                     @include transform(rotate(45deg))
-        .oe_folded
-            .label
-                padding-bottom: 8px
-            ul
-                position: absolute
-                border-top: 1px solid #cacaca
-                float: none
-                top: 30px
-                right: 0
-                display: none
-                li
-                    margin: 0
-                    border-left: 1px solid #cacaca
-                    display: block
-                li.label
-                    border: 0
-                    padding-left: 24px
-                li:last-child
-                    border-bottom: 1px solid #cacaca
-            &:hover ul
+        ul.oe_dropdown_menu
+            display: none
+            padding: 0
+            min-width: 0
+            &.oe_opened
                 display: block
+            li
+                margin: 0
+                width: 100%
+                span.label
+                    padding-left: 14px
+
         li.oe_active
             @include vertical-gradient(#729fcf, #3465a4)
             > .arrow span
@@ -2532,8 +2521,6 @@ $sheet-padding: 16px
     // }}}
 @-moz-document url-prefix()
     .openerp
-        .oe_view_manager .oe_view_manager_switch li
-            line-height: 21px
         .oe_searchview .oe_searchview_search
             top: -1px
         .oe_form_field_many2one .oe_m2o_cm_button