Merge lp:~openerp-dev/openerp-web/7.0-bug-1092869-nwi into lp:openerp-web/7.0

[Niko (OpenERP)]

Add a width to input type file.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Noise alternations to base.css bearing no relation to the actual issue. Fix sass compiler settings.

review: Needs Fixing

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2012-12-20 18:37:56 +0000
+++ addons/web/static/src/css/base.css	2012-12-27 14:37:00 +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");
@@ -30,7 +30,7 @@
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */ */
+   */
 }
 .openerp.openerp_webclient_container {
   height: 100%;
@@ -1265,7 +1265,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;
@@ -1290,7 +1290,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);
@@ -2240,7 +2240,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;
@@ -3131,6 +3131,9 @@
   border-radius: 3px;
 }
 
+.openerp_ie .oe_form_binary_file {
+  width: 80px;
+}
 .openerp_ie .oe_form_field_boolean input {
   background: white;
 }
@@ -3291,7 +3294,6 @@
     overflow: hidden !important;
   }
 }
-
 .blockUI.blockOverlay {
   background-color: black;
   opacity: 0.6;
 
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2012-12-20 18:37:56 +0000
+++ addons/web/static/src/css/base.sass	2012-12-27 14:37:00 +0000
@@ -2472,6 +2472,8 @@
 
 // Internet Explorer 9+ specifics {{{
 .openerp_ie
+    .oe_form_binary_file
+        width: 80px
     .oe_form_field_boolean input
         background: #fff
     input[type='checkbox']