Merge lp:~openerp-dev/openerp-web/7.0-opw-603932-msh into lp:openerp-web/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of statubar in chrome is aligned, it is aligned in inline block.

Demo: Run OpenERP with Chrome 31.0.1650.57 or I thin any other version 31.xx, open any form view where stausbar and button resides, say for example Customer Invoice and see button and statusbar is not inline, if you refresh the view you will not face this issue, but if you again click on Customer Invoice menu and open form view then again same issue.

Reason: In statusbar we added extra div with clear: both, not that clear:both will not allow floating elements on its both side(right and left), due to which statusbar is displayed outlined.

Thanks.

[Martin Trigaux (OpenERP) (mat-openerp)]

Thanks for the fix. I have removed the sass conversion lines (utf-8 -> UTF-8, etc.) to make the diff minimal.

revno: 4139 [merge]
revision-id: <email address hidden>

review: Approve

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2014-02-04 15:50:46 +0000
+++ addons/web/static/src/css/base.css	2014-02-13 14:14:05 +0000
@@ -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");
@@ -1029,7 +1029,7 @@
   background-image: -moz-linear-gradient(top, #fc8787, maroon);
   background-image: -ms-linear-gradient(top, #fc8787, maroon);
   background-image: -o-linear-gradient(top, #fc8787, maroon);
-  background-image: linear-gradient(to bottom, #fc8787, #800000);
+  background-image: linear-gradient(to bottom, #fc8787, maroon);
 }
 .openerp .oe_topbar .oe_topbar_anonymous_login a {
   display: block;
@@ -1275,7 +1275,7 @@
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
-  border: 1px solid lightGray;
+  border: 1px solid lightgrey;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -1307,7 +1307,7 @@
   transform: scale(1.1);
 }
 .openerp .oe_secondary_submenu .oe_active {
-  border-top: 1px solid lightGray;
+  border-top: 1px solid lightgrey;
   border-bottom: 1px solid #dedede;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
@@ -2163,6 +2163,7 @@
 }
 .openerp .oe_form header {
   position: relative;
+  overflow: hidden;
   border-bottom: 1px solid #cacaca;
   padding-left: 2px;
   background-color: #ededed;
@@ -2288,7 +2289,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2014-02-04 15:50:46 +0000
+++ addons/web/static/src/css/base.sass	2014-02-13 14:14:05 +0000
@@ -1711,6 +1711,7 @@
     // FormView.header {{{
     .oe_form header
         position: relative
+        overflow: hidden
         border-bottom: 1px solid #cacaca
         padding-left: 2px
         @include vertical-gradient(#fcfcfc, #dedede)

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2014-02-06 10:24:09 +0000
+++ addons/web/static/src/js/view_form.js	2014-02-13 14:14:05 +0000
@@ -5389,9 +5389,6 @@
         if (this.options.clickable) {
             this.$el.on('click','li',this.on_click_stage);
         }
-        if (this.$el.parent().is('header')) {
-            this.$el.after('<div class="oe_clear"/>');
-        }
         this._super();
     },
     set_value: function(value_) {