[MERGE] fixes

bzr revid: fva@openerp.com-20120920122618-j1fljw9vqrdp27v1 bzr revid: fva@openerp.com-20120920123926-91aj8d9lv11f45t8
2012-09-20 14:39:26 +02:00 · 2012-09-20 14:39:26 +02:00 · 336147abf9
parent 5959a1f7a9 17f91152e7
commit 336147abf9
2 changed files with 2873 additions and 60 deletions
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@ -475,12 +475,12 @@ $sheet-max-width: 860px
            text-decoration: none
        margin-bottom: 1px
    // }}}
-	.oe_form
-		header
-			.oe_tags
-			  margin:5px 0 0 5px
-			  width:400px
-			  padding-bottom:0
+    .oe_form
+        header
+            .oe_tags
+                margin: 5px 0 0 5px
+                width: 400px
+                padding-bottom: 0
    // Tooltips {{{
    &.oe_tooltip
        font-size: 12px