[IMP] Fix css with header of no_form, Fix css for Entypo lin height, Fix js positionn...

bzr revid: jke@openerp.com-20140127172414-qftefwct3zbgfvrt

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ea57a7b..3220d6a 100644 (file)
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -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");
@@ -349,6 +349,7 @@
   font-family: "entypoRegular" !important;
   font-size: 34px;
   font-weight: 300 !important;
+  line-height: 100%;
 }
 .openerp .oe_left {
   float: left;
@@ -658,10 +659,6 @@
   display: block;
   color: gray;
 }
-.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active { 
-  border-bottom: none;
-  padding-bottom: 1px;
-}
 .openerp .oe_notebook > li.ui-tabs-active > a {
   color: #4c4c4c;
 }
@@ -687,6 +684,10 @@
   background-color: #eeeeee;
   border-color: #eeeeee #eeeeee #dddddd;
 }
+.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active {
+  border-bottom: none;
+  padding-bottom: 1px;
+}
 .openerp .oe_notebook > li.ui-state-active > a, .openerp .oe_notebook > li.ui-state-active > a:hover {
   background-color: white;
   border: 1px solid #dddddd;
@@ -2022,8 +2023,21 @@
 .openerp .oe_application .oe_form_sheet .oe_notebook_page {
   padding: 0 16px;
 }
+.openerp .oe_form > :not(.oe_form_nosheet) header {
+  padding-left: 2px;
+}
+.openerp .oe_form > :not(.oe_form_nosheet) header ul {
+  display: inline-block;
+  float: right;
+}
+.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button {
+  margin: 3px 2px 1px;
+  float: left;
+}
+.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button:first-child {
+  margin-left: 6px;
+}
 .openerp .oe_form header {
-  position: relative;
   border-bottom: 1px solid #cacaca;
   padding-left: 2px;
   background-color: #ededed;
@@ -2037,17 +2051,6 @@
 .openerp .oe_form header > span {
   margin-left: 4px;
 }
-.openerp .oe_form header ul {
-  display: inline-block;
-  float: right;
-}
-.openerp .oe_form header .oe_button {
-  margin: 3px 2px 1px;
-  float: left;
-}
-.openerp .oe_form header .oe_button:first-child {
-  margin-left: 6px;
-}
 .openerp .oe_form header .oe_tags {
   margin: 5px 0 0 5px;
   width: 400px;
@@ -2150,7 +2153,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;

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b280c82..9f1b000 100644 (file)
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -369,6 +369,7 @@ $sheet-padding: 16px
         font-family: "entypoRegular" !important
         font-size: 34px
         font-weight: 300 !important
+        line-height: 100%
     .oe_left
         float: left
         margin-right: 8px
@@ -1639,13 +1640,8 @@ $sheet-padding: 16px
                 padding: 0 16px
     // }}}
     // FormView.header {{{
-    .oe_form header
-        position: relative
-        border-bottom: 1px solid #cacaca
+    .oe_form > :not(.oe_form_nosheet) header
         padding-left: 2px
-        @include vertical-gradient(#fcfcfc, #dedede)
-        > span
-            margin-left: 4px
         ul
             display: inline-block
             float: right
@@ -1654,6 +1650,14 @@ $sheet-padding: 16px
             float: left
             &:first-child
                 margin-left: 6px
+
+    .oe_form  header
+        border-bottom: 1px solid #cacaca
+        padding-left: 2px
+        @include vertical-gradient(#fcfcfc, #dedede)
+        > span
+            margin-left: 4px        
+        
     // }}}
     // FormView.custom tags and classes {{{
     .oe_form
@@ -1981,7 +1985,7 @@ $sheet-padding: 16px
                 .oe_e
                     position: relative
                     top: -1px
-                    left: -9px
+                    left: -9px                    
             input.oe_form_binary_file
                 display: inline-block
                 margin-left: -85px

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 9a5277b..dea09b7 100644 (file)
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,3 +1,4 @@
+@charset "utf-8";
 .openerp .oe_kanban_view {
   background: white;
   height: inherit;
@@ -202,6 +203,7 @@
   margin-left: 4px;
   cursor: pointer;
   position: relative;
+  z-index: 1;
 }
 .openerp .oe_kanban_view .oe_kanban_add {
   top: -8px;

diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 369ef40..77533c1 100644 (file)
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -217,6 +217,7 @@
         margin-left: 4px
         cursor: pointer
         position: relative
+        z-index: 1
     .oe_kanban_add
         top: -8px
     .oe_kanban_header .oe_dropdown_toggle

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index c065bfa..f600e20 100644 (file)
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -43,6 +43,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         this.currently_dragging = {};
         this.limit = options.limit || 40;
         this.add_group_mutex = new $.Mutex();
+        this.last_position = 'static';
     },
     view_loading: function(r) {
         return this.load_kanban(r);
@@ -495,6 +496,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
             || (!this.options.action.help && !this.options.action.get_empty_list_help)) {
             return;
         }
+        this.last_position = this.$el.find('table:first').css("position");
         this.$el.find('table:first').css("position", "absolute");
         $(QWeb.render('KanbanView.nocontent', { content : this.options.action.get_empty_list_help || this.options.action.help})).insertAfter(this.$('table:first'));
         this.$el.find('.oe_view_nocontent').click(function() {
@@ -502,8 +504,8 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         });
     },
     remove_no_result: function() {
-        this.$el.find('table:first').css("position", false);
-        this.$el.find('.oe_view_nocontent').remove();
+        this.$el.find('table:first').css("position", this.last_position);
+        this.$el.find('.oe_view_nocontent').remove();        
     },
 
     /*