Merge lp:~openerp-dev/openerp-web/7.0-bug-1125218-dharmang into lp:openerp-web/7.0

[Dharmang Soni (OpenERP)]

Hello,

I have fixed the search box overlap problem with other elements when many filters are added.

Thank You,
Dharmang Soni

Unmerged revisions

3885. By Dharmang Soni (OpenERP) on 2013-04-05

[FIX] Search box doesn't expand to wrap heavy filters, causing the filter to overlap with other elements

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2013-04-04 10:23:06 +0000
+++ addons/web/static/src/css/base.css	2013-04-05 09:58:34 +0000
@@ -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%;
@@ -1269,7 +1269,7 @@
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
-  border: 1px solid lightgrey;
+  border: 1px solid lightGray;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -1301,7 +1301,7 @@
   transform: scale(1.1);
 }
 .openerp .oe_secondary_submenu .oe_active {
-  border-top: 1px solid lightgrey;
+  border-top: 1px solid lightGray;
   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);
@@ -1669,14 +1669,14 @@
   top: 0;
   right: 18px;
   width: 15px;
-  height: 100%;
-  background: url(../img/search_reset.gif) center center no-repeat;
+  height: 20px;
+  background: url(../img/search_reset.gif) center 7px no-repeat;
 }
 .openerp .oe_searchview .oe_searchview_unfold_drawer {
   position: absolute;
   top: 0;
   right: 0;
-  height: 100%;
+  height: 20px;
   padding: 0 7px 0 4px;
   color: #cccccc;
   cursor: pointer;
@@ -1752,6 +1752,7 @@
 .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet {
   position: relative;
   cursor: pointer;
+  height: auto;
   padding: 0;
   -webkit-font-smoothing: auto;
 }
@@ -2284,7 +2285,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;
@@ -3362,6 +3363,7 @@
     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	2013-04-04 10:23:06 +0000
+++ addons/web/static/src/css/base.sass	2013-04-05 09:58:34 +0000
@@ -1335,13 +1335,13 @@
             top: 0
             right: 18px
             width: 15px
-            height: 100%
-            background: url(../img/search_reset.gif) center center no-repeat
+            height: 20px
+            background: url(../img/search_reset.gif) center 7px no-repeat
         .oe_searchview_unfold_drawer
             position: absolute
             top: 0
             right: 0
-            height: 100%
+            height: 20px
             padding: 0 7px 0 4px
             color: #ccc
             cursor: pointer
@@ -1395,6 +1395,7 @@
             .oe_searchview_facet
                 position: relative
                 cursor: pointer
+                height: auto
                 padding: 0
                 -webkit-font-smoothing: auto
                 // spacing for opera, FF