[MERGE] fme

bzr revid: mit@openerp.com-20120402114340-dvf5rbysvabvlvah

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index d1d59a8..2214394 100644 (file)
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -124,7 +124,49 @@ $colour4: #8a89ba
         color: white
         width: 90px
         @include vertical-gradient(#dc5f59, #b33630)
-  
+
+    // Tag reset {{{
+    table
+        padding: 0
+        font-size: 13px
+        border-collapse: collapse
+    thead
+        font-weight: bold
+        background-color: #f0f0f0
+        th
+            border-right: 1px dotted #afafb6
+            &:last-child
+                border-right: none
+    th, td
+        padding: 0
+        line-height: 18px
+        text-align: left
+    th
+        font-weight: bold
+        vertical-align: middle
+
+    td
+        vertical-align: top
+
+    .zebra tbody tr:nth-child(odd) td
+        background-color: #f0f0fa
+        @include vertical-gradient(#f0f0fa, #eeeef6)
+
+    .zebra tbody tr:hover td
+        @include vertical-gradient(#eee, #dedede)
+
+    .numeric
+        text-align: right
+        width: 82px
+        input
+            text-align: right
+    ul, li
+        margin: 0
+        padding: 0
+    
+    li
+        list-style-type: none
+    // }}}
 
     
     // }}}
@@ -289,7 +331,6 @@ $colour4: #8a89ba
         padding: 0
         margin: 0
         li
-            list-style-type: none
             float: left
         a
             display: block
@@ -334,7 +375,6 @@ $colour4: #8a89ba
         li
             position: relative
             padding: 1px 0 1px 16px
-            list-style-type: none
             a
                 display: block
                 color: #4c4c4c
@@ -430,7 +470,6 @@ $colour4: #8a89ba
             li   
                 padding: 0
                 margin: 0
-                list-style-type: none
                 float: left 
                 vertical-align: top
                 border-right: 1px solid #cacaca
@@ -549,9 +588,50 @@ $colour4: #8a89ba
         cursor: default
 
     // }}}
-    // FormView Widgets {{{
-    .oe_form_label_help[for], .oe_form_label[for]
-        white-space: nowrap
+    // Kanban view {{{
+    .oe_kanban_group_title
+        margin: 1px 1px 4px
+        font-size: 15px
+        font-weight: bold
+        text-shadow: 0 1px 0 white
+    .oe_kanban_column, .oe_kanban_group_header
+        width: 240px
+        vertical-align: top
+        padding: 6px 7px 6px 6px
+        background: #f0eeee
+        border-left: 1px solid #f0f8f8
+        border-right: 1px solid #b9b9b9
+    .oe_kanban_record
+        position: relative
+        display: block
+        min-height: 50px
+        background: white
+        border: 1px solid #d8d8d8
+        border-bottom-color: #b9b9b9
+        padding: 6px
+        margin: 6px 0
+        display: block
+        @include radius(4px)
+        &:last-child
+            margin-bottom: 0
+        &:hover
+            @include box-shadow(0 0 3px rgba(0,0,0,0.6))
+        .oe_kanban_title
+            font-weight: bold
+            margin: 2px 4px
+    .oe_kanban_gravatar
+        width: 20px
+        height: 20px
+        @include radius(3px)
+        @include box-shadow(0 1px 2px rgba(0,0,0,0.2))
+    // }}}
+
+    // Application to rename into action {{{
+    .oe_application
+        a
+            color: $colour4
+            &:hover
+                text-decoration: underline
     // }}}
 
 // Transitional overrides for old styles {{{

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index ff25085..99fc3cf 100644 (file)
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -47,7 +47,7 @@ openerp.web.Notification =  openerp.web.OldWidget.extend(/** @lends openerp.web.
 
 openerp.web.dialog = function(element) {
     var result = element.dialog.apply(element, _.rest(_.toArray(arguments)));
-    result.dialog("widget").addClass("openerp openerp2");
+    result.dialog("widget").addClass("openerp2");
     return result;
 }
 
@@ -982,7 +982,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
     },
     start: function() {
         var self = this;
-        this.$element.addClass("openerp openerp2");
+        this.$element.addClass("openerp2");
         if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
             this.$element.addClass("kitten-mode-activated");
             this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) {