[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20121112105022-lnr1cx6mmxlertoe

addons/note/static/src/css/note.css

@@ -49,8 +49,8 @@
   padding: 8px;
   margin-left: 3px;
   margin-right: 3px;
-  padding-bottom: 16px;
-  margin-bottom: 16px;
+  padding-bottom: 8px;
+  margin-bottom: 10px;
   -webkit-transform: rotate(-2deg);
   -o-transform: rotate(-2deg);
   -moz-transform: rotate(-2deg);

addons/note/static/src/css/note.sass

@@ -53,8 +53,8 @@
       padding: 8px
       margin-left: 3px
       margin-right: 3px
-      padding-bottom: 16px
-      margin-bottom: 16px
+      padding-bottom: 8px
+      margin-bottom: 10px
       @include rotate(-2deg)
       @include transition(all, 300ms)
   .oe_kanban_record:nth-of-type(even)