[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140401100513-e4iglorrxnj0ne8j
bzr revid: tde@openerp.com-20140403122017-zl668mpi0w5gwps0
bzr revid: tde@openerp.com-20140408083733-8plf5daah4c8yxxx

2 files changed, 84 insertions, 11 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 3996579e02a..5469c5376b0 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");
@@ -368,6 +368,7 @@
 .openerp .oe_left {
   float: left;
   margin-right: 8px;
+  width: 305px;
 }
 .openerp .oe_right {
   float: right;
@@ -456,11 +457,46 @@
   background: #ed6f6a;
 }
 .openerp .oe_button_box {
-  width: 270px;
-  text-align: right;
+  width: 400px;
+  text-align: left;
+}
+.openerp .oe_button_box .oe_stat_button:hover {
+  background: #7c7bad;
+  color: white;
+}
+.openerp .oe_button_box .oe_stat_button:hover .fa {
+  color: white;
 }
-.openerp .oe_button_box button {
-  margin: 4px;
+.openerp .oe_button_box .oe_stat_button {
+  font-weight: normal;
+  display: inline-table;
+  width: 33% !important;
+  height: 42px;
+  margin: 0px -1px -1px 0px;
+  padding: 0;
+  color: #666666;
+  border: 1px solid #dddddd;
+  border-radius: 0;
+  box-shadow: none;
+  background: white;
+}
+.openerp .oe_button_box .oe_stat_button > div {
+  display: table-cell;
+  vertical-align: middle;
+  text-align: left;
+  padding: 0;
+  line-height: 120%;
+}
+.openerp .oe_button_box .oe_stat_button .stat_button_icon {
+  color: #7c7bad;
+  font-size: 24px;
+  padding: 0px 3px;
+  width: 37px;
+  text-align: center;
+}
+.openerp .oe_button_box .oe_stat_button svg {
+  width: 38px;
+  height: 38px;
 }
 .openerp .oe_avatar > img {
   max-height: 90px;
@@ -1248,12 +1284,14 @@
   width: 100%;
 }
 .openerp .oe_view_manager .oe_view_manager_body {
-  display: table-row;
   height: inherit;
 }
 .openerp .oe_view_manager .oe_view_manager_view_kanban:not(:empty) {
   height: inherit;
 }
+.openerp .oe_view_manager[data-view-type=kanban] .oe_view_manager_body {
+  display: table-row;
+}
 .openerp .oe_view_manager table.oe_view_manager_header {
   border-collapse: separate;
   width: 100%;
@@ -2362,6 +2400,7 @@
 }
 .openerp .oe_hidden_input_file {
   position: relative;
+  overflow-x: hidden;
 }
 .openerp .oe_hidden_input_file input.oe_form_binary_file {
   z-index: 0;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b08427e0832..65f22a89481 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -385,6 +385,7 @@ $sheet-padding: 16px
     .oe_left
         float: left
         margin-right: 8px
+        width: 305px
     .oe_right
         float: right
         margin-left: 8px
@@ -429,10 +430,40 @@ $sheet-padding: 16px
             &:hover
                 background: #ED6F6A
     .oe_button_box
-        width: 270px
-        text-align: right
-        button
-            margin: 4px
+        width: 400px
+        text-align: left
+        .oe_stat_button:hover
+            background: #7c7bad
+            color: white
+            .fa
+                color: white
+        .oe_stat_button
+            font-weight: normal
+            display: inline-table
+            width: 33% !important
+            height: 42px
+            margin: 0px -1px -1px 0px
+            padding: 0
+            color: #666
+            border: 1px solid #dddddd
+            border-radius: 0
+            box-shadow: none
+            background: white
+            > div
+                display: table-cell
+                vertical-align: middle
+                text-align: left
+                padding: 0
+                line-height: 120%
+            .stat_button_icon
+                color: #7C7BAD
+                font-size: 24px
+                padding: 0px 3px
+                width: 37px
+                text-align: center
+            svg
+                width: 38px
+                height: 38px
     .oe_avatar
         > img
             max-height: 90px
@@ -1037,10 +1068,12 @@ $sheet-padding: 16px
         height: inherit
         width: 100%
         .oe_view_manager_body
-            display: table-row
             height: inherit
         .oe_view_manager_view_kanban:not(:empty)
             height: inherit
+        &[data-view-type=kanban]
+            .oe_view_manager_body
+                display: table-row
 
         table.oe_view_manager_header
             border-collapse: separate
@@ -1920,6 +1953,7 @@ $sheet-padding: 16px
         // Position: relative is used for the hidden input[type=file]
         // Do not remove it anymore !
         position: relative
+        overflow-x: hidden
         input.oe_form_binary_file
             z-index: 0
             line-height: 0