[MERGE] trunk

bzr revid: al@openerp.com-20120625085054-81zmounxwgv5xo6u

2 files changed, 297 insertions, 456 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 024ecbbb965..0d4912c2840 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -152,10 +152,13 @@
   box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
 }
 .openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active {
-  background: #e3e3e3;
-  background: -moz-linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f;
-  background: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)) #1b468f;
-  background: linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f;
+  background-color: #e3e3e3;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6));
+  background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6);
+  background-image: -moz-linear-gradient(top, #e3e3e3, #f6f6f6);
+  background-image: -ms-linear-gradient(top, #e3e3e3, #f6f6f6);
+  background-image: -o-linear-gradient(top, #e3e3e3, #f6f6f6);
+  background-image: linear-gradient(to bottom, #e3e3e3, #f6f6f6);
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
@@ -215,8 +218,8 @@
 .openerp .oe_bold {
   font-weight: bold;
 }
-.openerp .oe_inline  {
-  width: auto;
+.openerp .oe_inline {
+  width: auto !important;
 }
 .openerp .oe_highlight {
   color: white;
@@ -258,12 +261,21 @@
   -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
   box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
 }
+.openerp .oe_title {
+  width: 55%;
+}
+.openerp .oe_title:after {
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
 .openerp .oe_button_box {
   width: 200px;
   text-align: center;
 }
 .openerp .oe_avatar {
-  float: left;
   margin: 0 16px 0 0;
 }
 .openerp .oe_avatar img {
@@ -355,34 +367,23 @@
 .openerp .ui-tabs-hide {
   display: none;
 }
-.openerp .oe_dropdown_toggle:after {
-  width: 0;
-  height: 0;
-  display: inline-block;
-  content: "&darr";
-  text-indent: -99999px;
-  vertical-align: top;
-  border-left: 4px solid transparent;
-  border-right: 4px solid transparent;
-  border-top: 4px solid white;
-  filter: alpha(opacity=50);
-  opacity: 0.5;
-  margin-top: 7px;
-  margin-left: 6px;
-  border-top-color: #404040;
+.openerp .oe_dropdown, .openerp .oe_dropdown_hover, .openerp .oe_dropdown_toggle {
+  position: relative;
+  cursor: pointer;
+}
+.openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened {
+  display: block;
 }
 .openerp .oe_dropdown_menu {
   display: none;
   position: absolute;
   top: 28px;
-  left: 0px;
-  padding: 8px;
+  z-index: 1;
   border: 1px solid #afafb6;
+  background: white;
+  padding: 8px;
   min-width: 120px;
-  overflow-x: hidden;
-  z-index: 900;
   text-align: left;
-  background: white;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -390,14 +391,13 @@
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
 }
-.openerp .oe_dropdown_menu li {
-  position: relative;
+.openerp .oe_dropdown_menu > li {
   list-style-type: none;
   float: none;
   display: block;
-  background-color: none;
+  position: relative;
 }
-.openerp .oe_dropdown_menu li:hover {
+.openerp .oe_dropdown_menu > li:hover {
   background-color: #f0f0fa;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
   background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6);
@@ -409,64 +409,47 @@
   -webkit-box-shadow: none;
   box-shadow: none;
 }
-.openerp .oe_dropdown_menu li a {
+.openerp .oe_dropdown_menu > li > a {
+  white-space: nowrap;
   display: block;
   padding: 3px 6px;
-  clear: both;
-  font-weight: normal;
-  line-height: 14px;
   color: #4c4c4c;
   text-decoration: none;
-  cursor: pointer;
 }
-.openerp .oe_dropdown_menu li a:hover {
+.openerp .oe_dropdown_menu > li > a:hover {
   text-decoration: none;
 }
-.openerp .oe_dropdown_menu li .oe_sidebar_delete_item {
-  position: absolute;
-  bottom: 1px;
-  right: 4px;
-  display: none;
-  width: 12px;
-  height: 12px;
-  line-height: 12px;
-  padding: 1px;
-  color: #8786b7;
-  line-height: 8px;
-  text-align: center;
-  font-weight: bold;
-  text-shadow: 0 1px 1px white;
-}
-.openerp .oe_dropdown_menu li .oe_sidebar_delete_item:hover {
-  text-decoration: none;
-  color: white;
-  background: #8786b7;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4);
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-  border-radius: 2px;
-}
-.openerp .oe_dropdown_menu li:hover .oe_sidebar_delete_item {
+.openerp .oe_dropdown_arrow:after {
+  width: 0;
+  height: 0;
   display: inline-block;
+  content: "&darr";
+  text-indent: -99999px;
+  vertical-align: top;
+  margin-top: 8px;
+  margin-left: 4px;
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top: 4px solid #404040;
+  filter: alpha(opacity=50);
+  opacity: 0.5;
 }
 .openerp .oe_sidebar {
   white-space: nowrap;
 }
-.openerp .oe_sidebar .oe_dropdown_menu li {
-  padding-right: 16px;
-}
-.openerp .oe_sidebar .oe_sidebar_add_attachment {
+.openerp .oe_sidebar .oe_dropdown_menu .oe_sidebar_add_attachment {
+  height: 20px;
   cursor: pointer;
   padding-left: 6px;
   margin-top: 6px;
 }
-.openerp .oe_sidebar .oe_sidebar_add_attachment span {
+.openerp .oe_sidebar .oe_dropdown_menu .oe_sidebar_add_attachment span {
   font-weight: bold;
 }
-.openerp .oe_sidebar .oe_sidebar_add_attachment .oe_hidden_input_file {
+.openerp .oe_sidebar .oe_dropdown_menu .oe_sidebar_add_attachment .oe_hidden_input_file {
   width: 200px;
 }
-.openerp .oe_sidebar .oe_sidebar_add_attachment:hover {
+.openerp .oe_sidebar .oe_dropdown_menu .oe_sidebar_add_attachment:hover {
   background-color: #f0f0fa;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
   background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6);
@@ -478,6 +461,32 @@
   -webkit-box-shadow: none;
   box-shadow: none;
 }
+.openerp .oe_sidebar .oe_dropdown_menu li .oe_sidebar_delete_item {
+  position: absolute;
+  top: 4px;
+  right: 4px;
+  display: none;
+  width: 12px;
+  height: 12px;
+  padding: 1px;
+  color: #8786b7;
+  line-height: 8px;
+  text-align: center;
+  font-weight: bold;
+  text-shadow: 0 1px 1px white;
+}
+.openerp .oe_sidebar .oe_dropdown_menu li .oe_sidebar_delete_item:hover {
+  text-decoration: none;
+  color: white;
+  background: #8786b7;
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4);
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  border-radius: 2px;
+}
+.openerp .oe_sidebar .oe_dropdown_menu li:hover .oe_sidebar_delete_item {
+  display: inline-block;
+}
 .openerp .oe_loading {
   display: none;
   z-index: 100;
@@ -678,10 +687,7 @@
   background-image: -o-linear-gradient(top, #646060, #262626);
   background-image: linear-gradient(to bottom, #646060, #262626);
 }
-.openerp .oe_topbar .oe_topbar_item li {
-  float: left;
-}
-.openerp .oe_topbar .oe_topbar_item li a {
+.openerp .oe_topbar .oe_topbar_item {
   display: block;
   padding: 5px 10px 7px;
   line-height: 20px;
@@ -690,7 +696,7 @@
   vertical-align: top;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
 }
-.openerp .oe_topbar .oe_topbar_item li a:hover {
+.openerp .oe_topbar .oe_topbar_item:hover {
   background: #303030;
   color: white;
   -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
@@ -716,20 +722,40 @@
 .openerp .oe_topbar .oe_topbar_avatar {
   vertical-align: top;
 }
-.openerp .oe_topbar .oe_dropdown_toggle:after {
-  width: 0;
-  height: 0;
-  display: inline-block;
-  content: "&darr";
-  text-indent: -99999px;
-  vertical-align: top;
-  margin-top: 8px;
-  margin-left: 4px;
-  border-left: 4px solid transparent;
-  border-right: 4px solid transparent;
+.openerp .oe_topbar .oe_dropdown_arrow:after {
   border-top: 4px solid white;
-  filter: alpha(opacity=50);
-  opacity: 0.5;
+}
+.openerp .oe_topbar .oe_dropdown_menu {
+  background: #333333;
+  background: rgba(37, 37, 37, 0.9);
+  border-color: #999999;
+  border-color: rgba(0, 0, 0, 0.2);
+  border-style: solid;
+  border-width: 0 1px 1px;
+  -moz-border-radius: 0 0 6px 6px;
+  -webkit-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
+  background-clip: padding-box;
+}
+.openerp .oe_topbar .oe_dropdown_menu li {
+  float: none;
+}
+.openerp .oe_topbar .oe_dropdown_menu li a {
+  color: #eeeeee;
+}
+.openerp .oe_topbar .oe_dropdown_menu li a:hover {
+  background-color: #292929;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919));
+  background-image: -webkit-linear-gradient(top, #292929, #191919);
+  background-image: -moz-linear-gradient(top, #292929, #191919);
+  background-image: -ms-linear-gradient(top, #292929, #191919);
+  background-image: -o-linear-gradient(top, #292929, #191919);
+  background-image: linear-gradient(to bottom, #292929, #191919);
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
 }
 .openerp .oe_leftbar {
   display: none;
@@ -778,66 +804,8 @@
   list-style-type: none;
   float: left;
 }
-.openerp .oe_user_menu .oe_dropdown {
-  position: relative;
-}
-.openerp .oe_user_menu .oe_dropdown_options {
-  float: left;
-  background: #333333;
-  background: rgba(37, 37, 37, 0.9);
-  display: none;
-  position: absolute;
-  top: 32px;
+.openerp .oe_user_menu .oe_dropdown_menu {
   right: -1px;
-  border: 0;
-  z-index: 900;
-  margin-left: 0;
-  margin-right: 0;
-  padding: 6px 0;
-  zoom: 1;
-  border-color: #999999;
-  border-color: rgba(0, 0, 0, 0.2);
-  border-style: solid;
-  border-width: 0 1px 1px;
-  -moz-border-radius: 0 0 6px 6px;
-  -webkit-border-radius: 0 0 6px 6px;
-  border-radius: 0 0 6px 6px;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-  -webkit-background-clip: padding-box;
-  -moz-background-clip: padding-box;
-  background-clip: padding-box;
-}
-.openerp .oe_user_menu .oe_dropdown_options li {
-  float: none;
-  display: block;
-  background-color: none;
-}
-.openerp .oe_user_menu .oe_dropdown_options li a {
-  white-space: nowrap;
-  display: block;
-  padding: 4px 15px;
-  clear: both;
-  font-weight: normal;
-  line-height: 18px;
-  color: #eeeeee;
-}
-.openerp .oe_user_menu .oe_dropdown_options li a:hover {
-  background-color: #292929;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919));
-  background-image: -webkit-linear-gradient(top, #292929, #191919);
-  background-image: -moz-linear-gradient(top, #292929, #191919);
-  background-image: -ms-linear-gradient(top, #292929, #191919);
-  background-image: -o-linear-gradient(top, #292929, #191919);
-  background-image: linear-gradient(to bottom, #292929, #191919);
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-}
-.openerp .oe_user_menu .oe_dropdown_options li hr {
-  border-top: 1px solid #999999;
-  border-bottom: 0;
 }
 .openerp .oe_systray > div {
   float: left;
@@ -846,61 +814,6 @@
 .openerp .oe_systray {
   float: right;
 }
-.openerp .oe_systray .oe_systray_dropdown {
-  position: relative;
-}
-.openerp .oe_systray .oe_systray_dropdown:hover .oe_systray_dropdown_options {
-  display: block;
-}
-.openerp .oe_systray .oe_systray_dropdown_options {
-  background: #333333;
-  background: rgba(37, 37, 37, 0.9);
-  display: none;
-  position: absolute;
-  z-index: 900;
-  border: 0;
-  margin-left: 0;
-  margin-right: 0;
-  padding: 6px 0;
-  border-color: #999999;
-  border-color: rgba(0, 0, 0, 0.2);
-  border-style: solid;
-  border-width: 0 1px 1px;
-  -moz-border-radius: 0 0 6px 6px;
-  -webkit-border-radius: 0 0 6px 6px;
-  border-radius: 0 0 6px 6px;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-  -webkit-background-clip: padding-box;
-  -moz-background-clip: padding-box;
-  background-clip: padding-box;
-}
-.openerp .oe_systray .oe_systray_dropdown_options li {
-  float: none;
-  display: block;
-  background-color: none;
-}
-.openerp .oe_systray .oe_systray_dropdown_options li a {
-  display: block;
-  padding: 4px 15px;
-  clear: both;
-  font-weight: normal;
-  line-height: 18px;
-  color: #eeeeee;
-}
-.openerp .oe_systray .oe_systray_dropdown_options li a:hover {
-  background-color: #292929;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919));
-  background-image: -webkit-linear-gradient(top, #292929, #191919);
-  background-image: -moz-linear-gradient(top, #292929, #191919);
-  background-image: -ms-linear-gradient(top, #292929, #191919);
-  background-image: -o-linear-gradient(top, #292929, #191919);
-  background-image: linear-gradient(to bottom, #292929, #191919);
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-}
 .openerp .oe_menu {
   float: left;
   padding: 0;
@@ -933,24 +846,6 @@
   -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
 }
-.openerp .oe_menu_more_container {
-  position: relative;
-}
-.openerp .oe_menu_more_container .oe_menu_more {
-  position: absolute;
-  padding: 0;
-  background-color: #646060;
-  z-index: 1;
-  border: 1px solid black;
-  border-bottom-left-radius: 5px;
-  border-bottom-right-radius: 5px;
-}
-.openerp .oe_menu_more_container .oe_menu_more li {
-  float: none;
-}
-.openerp .oe_menu_more_container .oe_menu_more li a {
-  white-space: nowrap;
-}
 .openerp .oe_secondary_menu_section {
   font-weight: bold;
   margin-left: 8px;
@@ -1185,6 +1080,9 @@
   padding: 2px;
   content: "i";
 }
+.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_form:after {
+  content: "m";
+}
 .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_graph:after {
   font-family: "mnmliconsRegular" !important;
   font-size: 21px;
@@ -1628,16 +1526,53 @@
 .openerp .oe_form_button_save_dirty:hover {
   background: #ed6f6a;
 }
-.openerp .oe_form_invisible {
-  display: none !important;
+.openerp .oe_form_editable .oe_highlight {
+  color: #404040;
+  background: none;
+}
+.openerp .oe_form_editable button.oe_highlight {
+  background-color: #efefef;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
+  background-image: -webkit-linear-gradient(top, #efefef, #d8d8d8);
+  background-image: -moz-linear-gradient(top, #efefef, #d8d8d8);
+  background-image: -ms-linear-gradient(top, #efefef, #d8d8d8);
+  background-image: -o-linear-gradient(top, #efefef, #d8d8d8);
+  background-image: linear-gradient(to bottom, #efefef, #d8d8d8);
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+}
+.openerp .oe_form_editable button.oe_highlight:active {
+  background-color: #e3e3e3;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6));
+  background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6);
+  background-image: -moz-linear-gradient(top, #e3e3e3, #f6f6f6);
+  background-image: -ms-linear-gradient(top, #e3e3e3, #f6f6f6);
+  background-image: -o-linear-gradient(top, #e3e3e3, #f6f6f6);
+  background-image: linear-gradient(to bottom, #e3e3e3, #f6f6f6);
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+.openerp .oe_form_editable button.oe_highlight:hover {
+  background-color: #f6f6f6;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3));
+  background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3);
+  background-image: -moz-linear-gradient(top, #f6f6f6, #e3e3e3);
+  background-image: -ms-linear-gradient(top, #f6f6f6, #e3e3e3);
+  background-image: -o-linear-gradient(top, #f6f6f6, #e3e3e3);
+  background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3);
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
 }
-.openerp .oe_form_editable .oe_edit_only {
+.openerp .oe_form_invisible {
   display: none !important;
 }
 .openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty {
   display: none !important;
 }
-.openerp .oe_form_nosheet > *:not(.oe_form_topbar) {
+.openerp .oe_form_nosheet > *:not(header) {
   margin-left: 10px !important;
   margin-right: 10px !important;
 }
@@ -1663,16 +1598,6 @@
   max-width: 960px;
   margin: 0 auto;
 }
-.openerp .oe_form_title {
-  width: 55%;
-}
-.openerp .oe_form_title:after {
-  content: ".";
-  display: block;
-  height: 0;
-  clear: both;
-  visibility: hidden;
-}
 .openerp ul.oe_form_steps {
   height: 30px;
   padding: 0;
@@ -1710,26 +1635,25 @@
   font-weight: bold;
   color: #b33630;
 }
-.openerp .oe_form_subtotal_footer {
-  width: auto;
-  float: right;
+.openerp .oe_form .oe_subtotal_footer {
+  width: 1% !important;
 }
-.openerp .oe_form_subtotal_footer td.oe_form_group_cell {
+.openerp .oe_form .oe_subtotal_footer td.oe_form_group_cell {
   text-align: right;
-  padding: 0;
+  padding: 0 !important;
 }
-.openerp .oe_form_subtotal_footer td.oe_form_group_cell_label {
-  border: none;
+.openerp .oe_form .oe_subtotal_footer td.oe_form_group_cell_label {
+  border-right: none;
 }
-.openerp .oe_form_subtotal_footer .oe_form_field {
+.openerp .oe_form .oe_subtotal_footer .oe_form_field {
   width: auto !important;
 }
-.openerp .oe_form_subtotal_footer .oe_form_subtotal_footer_separator {
+.openerp .oe_form .oe_subtotal_footer .oe_subtotal_footer_separator {
   border-top: 1px solid #cacaca;
-  font-size: 120%;
+  font-sie: 120%;
   font-weight: bold;
 }
-.openerp .oe_form_subtotal_footer label.oe_form_subtotal_footer_separator {
+.openerp .oe_form .oe_subtotal_footer label.oe_subtotal_footer_separator {
   font-weight: bold !important;
   padding: 2px 8px 2px 0px !important;
 }
@@ -1838,7 +1762,7 @@
 .openerp .oe_form .oe_form_field_selection select {
   width: inherit;
 }
-.openerp .oe_form .oe_form_sheet textarea {
+.openerp .oe_form .oe_form_field_text.oe_inline, .openerp .oe_form .oe_form_field_text.oe_inline > textarea {
   width: 500px;
 }
 .openerp .oe_form .oe_form_field_float input {
@@ -1924,6 +1848,7 @@
 }
 .openerp .oe_form .oe_form_field_boolean {
   padding-top: 4px;
+  width: auto;
 }
 .openerp .oe_form .oe_form_field_many2manytags .text-wrap {
   width: 100% !important;
@@ -2072,9 +1997,6 @@
 .openerp .oe-listview-content {
   width: 100%;
 }
-.openerp .oe-listview-content td:first-child, .openerp .oe-listview-content th:first-child {
-  width: 17px;
-}
 .openerp .oe-listview-content td:first-child:after, .openerp .oe-listview-content th:first-child:after {
   border-width: 0;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 1d092ef041e..35e1d08e17f 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -169,10 +169,7 @@ $colour4: #8a89ba
         @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset))
 
     a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active
-        background: #e3e3e3
-        background: -moz-linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f
-        background: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)) #1b468f
-        background: linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f
+        @include vertical-gradient(#e3e3e3, #f6f6f6)
         @include box-shadow(none)
 
     a.button.disabled, button:disabled, input[type='submit']:disabled
@@ -220,8 +217,8 @@ $colour4: #8a89ba
         color: #888
     .oe_bold
         font-weight: bold
-    .oe_inline 
-        width: auto
+    .oe_inline
+        width: auto !important
     .oe_highlight
         color: white
         background: #DC5F59
@@ -235,11 +232,18 @@ $colour4: #8a89ba
         @include vertical-gradient(#DF6B66, #BF3A33)
         //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%))
         @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2))
+    .oe_title
+        width: 55%
+    .oe_title:after
+        content: "."
+        display: block
+        height: 0
+        clear: both
+        visibility: hidden
     .oe_button_box
         width: 200px
         text-align: center
     .oe_avatar
-        float: left
         margin: 0 16px 0 0
         img
             height: 50px
@@ -311,92 +315,91 @@ $colour4: #8a89ba
         display: none
     // }}}
     // Dropdown {{{
-    .oe_dropdown_toggle:after
-        width: 0
-        height: 0
-        display: inline-block
-        content: "&darr"
-        text-indent: -99999px
-        vertical-align: top
-        border-left: 4px solid transparent
-        border-right: 4px solid transparent
-        border-top: 4px solid white
-        @include opacity(0.5)
-        margin-top: 7px
-        margin-left: 6px
-        border-top-color: #404040
+    .oe_dropdown, .oe_dropdown_hover, .oe_dropdown_toggle
+        position: relative
+        cursor: pointer
+    .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened
+        display: block
     .oe_dropdown_menu
         display: none
         position: absolute
         top: 28px
-        left: 0px
-        padding: 8px
+        z-index: 1
         border: 1px solid #afafb6
+        background: white
+        padding: 8px
         min-width: 120px
-        overflow-x: hidden
-        z-index: 900
         text-align: left
-        background: white
         @include radius(3px)
         @include box-shadow(0 1px 4px rgba(0,0,0,0.3))
-        li
+        > li
             &:hover
                 @include vertical-gradient(#f0f0fa, #eeeef6)
                 @include box-shadow(none)
-            position: relative
             list-style-type: none
             float: none
             display: block
-            background-color: none
-            a
+            position: relative
+            > a
+                white-space: nowrap
                 display: block
                 padding: 3px 6px
-                clear: both
-                font-weight: normal
-                line-height: 14px
                 color: #4c4c4c
                 text-decoration: none
-                cursor: pointer
                 &:hover
                     text-decoration: none
-            .oe_sidebar_delete_item
-                position: absolute
-                bottom: 1px
-                right: 4px
-                display: none
-                width: 12px
-                height: 12px
-                line-height: 12px
-                padding: 1px
-                color: #8786b7
-                line-height: 8px
-                text-align: center
-                font-weight: bold
-                text-shadow: 0 1px 1px white
-                &:hover
-                    text-decoration: none
-                    color: white
-                    background: #8786b7
-                    text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4)
-                    @include radius(2px)
-            &:hover
-                .oe_sidebar_delete_item
-                    display: inline-block
+    .oe_dropdown_arrow:after
+        width: 0
+        height: 0
+        display: inline-block
+        content: "&darr"
+        text-indent: -99999px
+        vertical-align: top
+        margin-top: 8px
+        margin-left: 4px
+        border-left: 4px solid transparent
+        border-right: 4px solid transparent
+        border-top: 4px solid#404040
+        @include opacity(0.5)
+
     .oe_sidebar
         white-space: nowrap
-        .oe_dropdown_menu li
-            padding-right: 16px
-        .oe_sidebar_add_attachment
-            cursor: pointer
-            padding-left: 6px
-            margin-top: 6px
-            span
-                font-weight: bold
-            .oe_hidden_input_file
-                width: 200px
-            &:hover
-                @include vertical-gradient(#f0f0fa, #eeeef6)
-                @include box-shadow(none)
+        .oe_dropdown_menu
+            .oe_sidebar_add_attachment
+                height: 20px
+                cursor: pointer
+                padding-left: 6px
+                margin-top: 6px
+                span
+                    font-weight: bold
+                .oe_hidden_input_file
+                    width: 200px
+                &:hover
+                    @include vertical-gradient(#f0f0fa, #eeeef6)
+                    @include box-shadow(none)
+            li
+                .oe_sidebar_delete_item
+                    position: absolute
+                    top: 4px
+                    right: 4px
+                    display: none
+                    width: 12px
+                    height: 12px
+                    padding: 1px
+                    color: #8786b7
+                    line-height: 8px
+                    text-align: center
+                    font-weight: bold
+                    text-shadow: 0 1px 1px white
+                    &:hover
+                        text-decoration: none
+                        color: white
+                        background: #8786b7
+                        text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4)
+                        @include radius(2px)
+                &:hover
+                    .oe_sidebar_delete_item
+                        display: inline-block
     // }}}
     // Loading {{{
     .oe_loading
@@ -552,20 +555,17 @@ $colour4: #8a89ba
         border-top: solid 1px #d3d3d3
         @include vertical-gradient(#646060, #262626)
         .oe_topbar_item
-            li
-                float: left
-                a
-                    display: block
-                    padding: 5px 10px 7px
-                    line-height: 20px
-                    height: 20px
-                    color: #eee
-                    vertical-align: top
-                    text-shadow: 0 1px 1px rgba(0,0,0,0.2)
-                    &:hover
-                        background: #303030
-                        color: white
-                        @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
+            display: block
+            padding: 5px 10px 7px
+            line-height: 20px
+            height: 20px
+            color: #eee
+            vertical-align: top
+            text-shadow: 0 1px 1px rgba(0,0,0,0.2)
+            &:hover
+                background: #303030
+                color: white
+                @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
             .oe_active
                 background: #303030
                 font-weight: bold
@@ -579,19 +579,24 @@ $colour4: #8a89ba
             @include radius(3px)
         .oe_topbar_avatar
             vertical-align: top
-        .oe_dropdown_toggle:after
-            width: 0
-            height: 0
-            display: inline-block
-            content: "&darr"
-            text-indent: -99999px
-            vertical-align: top
-            margin-top: 8px
-            margin-left: 4px
-            border-left: 4px solid transparent
-            border-right: 4px solid transparent
+        .oe_dropdown_arrow:after
             border-top: 4px solid white
-            @include opacity(0.5)
+        .oe_dropdown_menu
+            background: #333
+            background: rgba(37,37,37,0.9)
+            border-color: #999
+            border-color: rgba(0, 0, 0, 0.2)
+            border-style: solid
+            border-width: 0 1px 1px
+            @include radius(0 0 6px 6px)
+            @include background-clip()
+            li
+                float: none
+                a
+                    color: #eee
+                    &:hover
+                        @include vertical-gradient(#292929, #191919)
+                        @include box-shadow(none)
     // }}}
     // Webclient.leftbar {{{
     .oe_leftbar
@@ -635,48 +640,8 @@ $colour4: #8a89ba
         li
             list-style-type: none
             float: left
-        .oe_dropdown
-            position: relative
-
-        .oe_dropdown_options
-            float: left
-            background: #333
-            background: rgba(37,37,37,0.9)
-            display: none
-            position: absolute
-            top: 32px
+        .oe_dropdown_menu
             right: -1px
-            border: 0
-            z-index: 900
-            margin-left: 0
-            margin-right: 0
-            padding: 6px 0
-            zoom: 1
-            border-color: #999
-            border-color: rgba(0, 0, 0, 0.2)
-            border-style: solid
-            border-width: 0 1px 1px
-            @include radius(0 0 6px 6px)
-            @include box-shadow(0 1px 4px rgba(0,0,0,0.3))
-            @include background-clip()
-            li
-                float: none
-                display: block
-                background-color: none
-                a
-                    white-space: nowrap
-                    display: block
-                    padding: 4px 15px
-                    clear: both
-                    font-weight: normal
-                    line-height: 18px
-                    color: #eee
-                    &:hover
-                        @include vertical-gradient(#292929, #191919)
-                        @include box-shadow(none)
-                hr
-                    border-top: 1px solid #999
-                    border-bottom: 0
     // }}}
     // Systray {{{
     .oe_systray > div
@@ -684,42 +649,6 @@ $colour4: #8a89ba
         padding: 0 4px 0 4px
     .oe_systray
         float: right
-
-        .oe_systray_dropdown
-            position: relative
-        .oe_systray_dropdown:hover .oe_systray_dropdown_options
-            display: block
-        .oe_systray_dropdown_options
-            background: #333
-            background: rgba(37,37,37,0.9)
-            display: none
-            position: absolute
-            z-index: 900
-            border: 0
-            margin-left: 0
-            margin-right: 0
-            padding: 6px 0
-            border-color: #999
-            border-color: rgba(0, 0, 0, 0.2)
-            border-style: solid
-            border-width: 0 1px 1px
-            @include radius(0 0 6px 6px)
-            @include box-shadow(0 1px 4px rgba(0,0,0,0.3))
-            @include background-clip()
-            li
-                float: none
-                display: block
-                background-color: none
-                a
-                    display: block
-                    padding: 4px 15px
-                    clear: both
-                    font-weight: normal
-                    line-height: 18px
-                    color: #eee
-                    &:hover
-                        @include vertical-gradient(#292929, #191919)
-                        @include box-shadow(none)
     // }}}
     // Menu {{{
     .oe_menu
@@ -745,20 +674,6 @@ $colour4: #8a89ba
             font-weight: bold
             color: white
             @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
-    .oe_menu_more_container
-        position: relative
-        .oe_menu_more
-            position: absolute
-            padding: 0
-            background-color: #646060
-            z-index: 1
-            border: 1px solid black
-            border-bottom-left-radius: 5px
-            border-bottom-right-radius: 5px
-            li
-                float: none
-                a
-                    white-space: nowrap
     .oe_secondary_menu_section
         font-weight: bold
         margin-left: 8px
@@ -943,6 +858,8 @@ $colour4: #8a89ba
             .oe_vm_switch_list:after, .oe_vm_switch_tree:after
                 padding: 2px
                 content: "i"
+            .oe_vm_switch_form:after
+                content: "m"
             .oe_vm_switch_graph:after
                 font-family: "mnmliconsRegular" !important
                 font-size: 21px
@@ -1296,14 +1213,25 @@ $colour4: #8a89ba
         font-weight: bold
         &:hover
             background: #ED6F6A
+    .oe_form_editable
+        .oe_highlight
+            color: #404040
+            background: none
+        button.oe_highlight
+            @include vertical-gradient(#efefef, #d8d8d8)
+            @include box-shadow((0 1px 2px rgba(0, 0, 0, .1), 0 1px 1px rgba(255, 255, 255, .8) inset))
+        button.oe_highlight:active
+            @include vertical-gradient(#e3e3e3, #f6f6f6)
+            @include box-shadow(none)
+        button.oe_highlight:hover
+            @include vertical-gradient(#f6f6f6, #e3e3e3)
+            @include box-shadow((0 1px 2px rgba(0, 0, 0, .1), 0 1px 1px rgba(255, 255, 255, .8) inset))
     .oe_form_invisible
         display: none !important
-    .oe_form_editable .oe_edit_only
-        display: none !important
     .oe_form_readonly
         .oe_edit_only, .oe_form_field:empty
             display: none !important
-    .oe_form_nosheet > *:not(.oe_form_topbar)
+    .oe_form_nosheet > *:not(header)
         margin-left: 10px !important
         margin-right: 10px !important
     // }}}
@@ -1322,14 +1250,6 @@ $colour4: #8a89ba
             min-width: 650px
             max-width: 960px
             margin: 0 auto
-    .oe_form_title
-        width: 55%
-    .oe_form_title:after
-        content: "."
-        display: block
-        height: 0
-        clear: both
-        visibility: hidden
     ul.oe_form_steps
         height: 30px
         padding: 0
@@ -1359,21 +1279,20 @@ $colour4: #8a89ba
         .oe_form_steps_active
             font-weight: bold
             color: #b33630
-    .oe_form_subtotal_footer
-        width: auto
-        float: right
+    .oe_form .oe_subtotal_footer
+        width: 1% !important
         td.oe_form_group_cell
             text-align: right
-            padding: 0
+            padding: 0 !important
         td.oe_form_group_cell_label
-            border: none
+            border-right: none
         .oe_form_field
             width: auto !important
-        .oe_form_subtotal_footer_separator
+        .oe_subtotal_footer_separator
             border-top: 1px solid #cacaca
-            font-size: 120%
+            font-sie: 120%
             font-weight: bold
-        label.oe_form_subtotal_footer_separator
+        label.oe_subtotal_footer_separator
             font-weight: bold !important
             padding: 2px 8px 2px 0px !important
     // no sheet in popups
@@ -1468,7 +1387,7 @@ $colour4: #8a89ba
         .oe_form_field_text textarea,
         .oe_form_field_selection select
             width: inherit
-        .oe_form_sheet textarea
+        .oe_form_field_text.oe_inline, .oe_form_field_text.oe_inline > textarea
             width: 500px
         .oe_form_field_float input
             width: 100px
@@ -1528,6 +1447,7 @@ $colour4: #8a89ba
             white-space: nowrap
         .oe_form_field_boolean
             padding-top: 4px
+            width: auto
         .oe_form_field_many2manytags
             .text-wrap
                 width: 100% !important
@@ -1664,7 +1584,6 @@ $colour4: #8a89ba
     .oe-listview-content
         width: 100%
         td:first-child, th:first-child
-            width: 17px
             &:after
                 border-width: 0
         > thead