Merge lp:~openerp-dev/openerp-web/trunk-web-bootstrap3-ima into lp:~openerp-dev/openerp-web/trunk-web-bootstrap3

[Ishwar Malvi(OpenERP)]

Hello,
     I have fixed following issue,
       1. added css of [input, select, label] in [.oe_searchview] and customize global tag [h3] to remove search box, filter and advanced search options conflicts.
       2. added [.jqstooltip] to manage size of sale team kanban tooltip.
       3. improved [.oe_fileupload] to manage file attach button in chatter.

Thanks,
Ishwar Malvi

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2013-11-14 10:39:13 +0000
+++ addons/web/static/src/css/base.css	2013-11-14 11:41:21 +0000
@@ -1639,6 +1639,16 @@
   font-size: 12px;
   line-height: 18px;
 }
+.openerp .oe_searchview input:not([type]), .openerp .oe_searchview input[type="text"], .openerp .oe_searchview input[type="number"] {
+  width: 156px;
+  height: 22px;
+}
+.openerp .oe_searchview input[type="checkbox"] {
+  margin: 3px 3px 3px 4px;
+}
+.openerp .oe_searchview select {
+  margin: 2px 4px 2px 0;
+}
 .openerp .oe_searchview.oe_focused {
   border-color: #a6a6fe;
   -moz-box-shadow: 0 1px 2px #a6a6fe inset;
@@ -1863,6 +1873,7 @@
   box-sizing: border-box;
   display: table-cell;
   width: 50%;
+  padding-left: 2px;
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section ul {
   margin: 0 8px 8px;
@@ -1898,7 +1909,7 @@
   line-height: 18px;
 }
 .openerp .oe_searchview .oe_searchview_drawer form button {
-  margin: 0 0 8px 0;
+  margin: 0 0 8px -3px;
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom {
   padding: 0 8px 8px 8px;
@@ -1926,6 +1937,9 @@
   top: 0;
   right: 5px;
 }
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom label {
+  font-weight: normal;
+}
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_dashboard form {
   display: none;
   margin-top: 2px;
@@ -1953,6 +1967,7 @@
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li:first-child .searchview_extended_prop_or {
   visibility: hidden;
+  margin-left: -14px;
 }
 .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced .searchview_extended_prop_or {
   opacity: 0.5;
@@ -2544,13 +2559,14 @@
   display: inline-block;
   clear: both;
   width: 100%;
+  margin-bottom: -15px;
 }
 .openerp .oe_fileupload .oe_add {
   float: left;
   position: relative;
   width: 100%;
   left: 2px;
-  top: 7px;
+  top: 0px;
   overflow: hidden;
 }
 .openerp .oe_fileupload .oe_add button {
@@ -2562,9 +2578,7 @@
 }
 .openerp .oe_fileupload .oe_add button.oe_attach {
   width: 24px;
-  overflow: hidden;
-  width: 24px;
-  overflow: hidden;
+  margin-bottom: 15px;
   background: transparent;
   color: #7c7bad;
   box-shadow: none;
@@ -3462,10 +3476,15 @@
   line-height: normal;
 }
 
-h1, h2 {
+h1, h2, h3 {
   font-weight: bold;
 }
 
+.jqstooltip {
+  height: auto !important;
+  width: auto !important;
+}
+
 h5 {
   font-weight: bold;
   font-size: smaller;

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2013-11-14 10:39:13 +0000
+++ addons/web/static/src/css/base.sass	2013-11-14 11:41:21 +0000
@@ -471,7 +471,7 @@
         max-width: 650px
     .oe_grey
         color: #aaa
-    // Added for generic error message and customize bootstrap <pre>,<hr>
+    // Added for generic error message and customize bootstrap3 <pre>,<hr>
     .oe_error_detail 
         pre
             background-color: #FFFFFF
@@ -1322,6 +1322,15 @@
             height: 14px
             font-size: 12px
             line-height: 18px
+        //Customize searchview input, select
+        input:not([type]), input[type="text"], input[type="number"]
+            width: 156px
+            height: 22px
+        input[type="checkbox"]
+            margin: 3px 3px 3px 4px
+        select
+            margin: 2px 4px 2px 0 
+        //End of customize
         &.oe_focused
             border-color: $tag-border-selected
             @include box-shadow(0 1px 2px $tag-border-selected inset)
@@ -1486,6 +1495,7 @@
                     @include box-sizing(border)
                     display: table-cell
                     width: 50%
+                    padding-left: 2px // Managed padding-left according bootstrap3
                 ul
                     margin: 0 8px 8px
                     padding: 0
@@ -1515,7 +1525,7 @@
                     margin: 4px 0
                     line-height: 18px
                 button
-                    margin: 0 0 8px 0
+                    margin: 0 0 8px -3px // Managed margin-left according bootstrap3
             .oe_searchview_custom
                 padding: 0 8px 8px 8px
                 div
@@ -1535,6 +1545,10 @@
                         position: absolute
                         top: 0
                         right: 5px
+                //Customize for searchview label
+                label
+                    font-weight: normal
+                //End of Customize
             .oe_searchview_dashboard
                 form
                     display: none
@@ -1560,9 +1574,10 @@
                     white-space: nowrap
                     &:first-child .searchview_extended_prop_or
                         visibility: hidden
+                        margin-left: -14px
                 .searchview_extended_prop_or
                     opacity: 0.5
-                    margin-left: -14px
+                    margin-left: -14px //Customize 'or' in searchview
             .oe_opened
                 h4:before
                     content: "▾ "
@@ -2035,12 +2050,13 @@
         display: inline-block
         clear: both
         width: 100%
+        margin-bottom: -15px
         .oe_add
             float: left
             position: relative
             width: 100%
             left: +2px
-            top: +7px
+            top: +0px //Removed space according bootstrap3
             overflow: hidden
             button
                 display: inline
@@ -2050,9 +2066,7 @@
                 vertical-align: middle
             button.oe_attach
                 width: 24px
-                overflow: hidden
-                width: 24px
-                overflow: hidden
+                margin-bottom: 15px //Added space according bootstrap3
                 background: transparent
                 color: #7C7BAD
                 box-shadow: none
@@ -2750,10 +2764,16 @@
 // Customize for global tags
 button, body
     line-height: normal
-h1,h2
+h1,h2,h3
     font-weight: bold
 // End of customize
 
+// Customize for kanban tooltip
+.jqstooltip
+    height: auto !important
+    width: auto !important
+// End of kanban tooltip
+
 // Customize for chatter
 h5
     font-weight: bold