[MERGE] trunk

bzr revid: al@openerp.com-20120525122631-ef5vt5dg5gx2y296

2 files changed, 25 insertions, 3 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 51adabe626d..a77ea87bf4e 100644
--- 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");
@@ -605,6 +605,7 @@
   background-color: none;
 }
 .openerp .oe_user_menu .oe_dropdown_options li a {
+  white-space: nowrap;
   display: block;
   padding: 4px 15px;
   clear: both;
@@ -1802,6 +1803,9 @@
   right: 5px;
   top: 3px;
 }
+.openerp .oe_form .oe_form_group_cell .oe_kanban_view {
+  position: static;
+}
 .openerp .oe_form .oe_form_button.oe_button {
   height: 22px;
   color: #4c4c4c;
@@ -2154,6 +2158,15 @@
   color: #333333;
 }
 
+.kitten-mode-activated {
+  background-image: url(http://placekitten.com/g/1365/769);
+  background-size: cover;
+  background-attachment: fixed;
+}
+.kitten-mode-activated > * {
+  opacity: 0.7;
+}
+
 .openerp .oe_form_field_many2one td:first-child {
   position: relative;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 495251d3982..9fedeed6a51 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -507,6 +507,7 @@ $colour4: #8a89ba
                 display: block
                 background-color: none
                 a
+                    white-space: nowrap
                     display: block
                     padding: 4px 15px
                     clear: both
@@ -1115,8 +1116,6 @@ $colour4: #8a89ba
                         position: absolute
                         left: 4px
                         top: -2px
-
-                        //background: url(/web/static/src/img/icons/gtk-apply.png) no-repeat
                     // after oe_selected so background color is not overridden
                     &:hover
                         background-color: $hover-background
@@ -1443,6 +1442,9 @@ $colour4: #8a89ba
             filter: alpha(opacity=50)
             right: 5px
             top: 3px
+        .oe_form_group_cell .oe_kanban_view
+            // Hack due to absolute positioning of kanban view messing with o2m
+            position: static
     // }}}
     // FormView.buttons {{{
     .oe_form
@@ -1750,6 +1752,13 @@ $colour4: #8a89ba
         color: #333
     // }}}
 
+.kitten-mode-activated
+    background-image: url(http://placekitten.com/g/1365/769)
+    background-size: cover
+    background-attachment: fixed
+    >*
+        opacity: 0.70
+
 // Transitional overrides for old styles {{{
 .openerp
     .oe_form_field_many2one