[MERGE] fme

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

diff --cc addons/web/static/src/css/base.sass
index 86b1442,d1d59a8..2214394
--- 1/addons/web/static/src/css/base.sass
--- 2/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@@ -548,53 -509,49 +548,90 @@@ $colour4: #8a89b
      .oe_layout_debug_cell
          display: none
  
- 
+     .oe_form_notebook
+         margin: 8px 0
+         padding: 0 8px
+         list-style: none
+         zoom: 1
+     .oe_form_notebook:before, .oe_form_notebook:after
+         display: table
+         content: ""
+         zoom: 1
+     .oe_form_notebook:after
+         clear: both
+     .oe_form_notebook > li
+         float: left
+     .oe_form_notebook > li > a
+         display: block
+         color: #4c4c4c
+     .oe_form_notebook
+         border-color: #ddd
+         border-style: solid
+         border-width: 0 0 1px
+     .oe_form_notebook > li
+         position: relative
+         margin-bottom: -1px
+     .oe_form_notebook > li > a
+         padding: 0 12px
+         margin-right: 2px
+         line-height: 30px
+         border: 1px solid transparent
+         @include radius(4px 4px 0 0)
+     .oe_form_notebook > li > a:hover
+         text-decoration: none
+         background-color: #eee
+         border-color: #eee #eee #ddd
+     .oe_form_notebook > li.ui-state-active > a, .oe_form_notebook > li.ui-state-active > a:hover
+         background-color: #ffffff
+         border: 1px solid #ddd
+         border-bottom-color: transparent
+         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 --cc addons/web/static/src/js/chrome.js
Simple merge