[MERGE] merging notes + small cleaning

bzr revid: fp@openerp.com-20120916171015-e0n1lq2a5c10a0nb

3 files changed, 206 insertions, 69 deletions

diff --git a/addons/note/static/src/css/Makefile b/addons/note/static/src/css/Makefile
index d6019f4ed4a..91b3abc9333 100644
--- a/addons/note/static/src/css/Makefile
+++ b/addons/note/static/src/css/Makefile
@@ -1,3 +1,3 @@
-note.css: note.sass
-	sass -t expanded note.sass note.css
+memo.css: memo.sass
+	sass -t expanded memo.sass memo.css
 
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
index 7e79438b46a..6ada8d6cd14 100644
--- a/addons/note/static/src/css/note.css
+++ b/addons/note/static/src/css/note.css
@@ -1,78 +1,143 @@
-.openerp .oe_notes .oe_fold_column .oe_kanban_card {
-    text-decoration:none;
-    color:#000;
-    display:block;
-    padding:1em;
-    margin-right: 1em;
-    margin-bottom: 1em;
-
-    -moz-box-shadow:5px 5px 7px rgba(33,33,33,1);
-    -webkit-box-shadow: 5px 5px 7px rgba(33,33,33,.7);
-    box-shadow: 5px 5px 7px rgba(33,33,33,.7);
+@charset "utf-8";
+@font-face {
+  font-family: "mnmliconsRegular";
+  src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
+  src: url("/web/static/src/font/mnmliconsv21-webfont.woff") format("woff");
+  src: url("/web/static/src/font/mnmliconsv21-webfont.ttf") format("truetype");
+  src: url("/web/static/src/font/mnmliconsv21-webfont.svg") format("svg") active;
+  font-weight: normal;
+  font-style: normal;
 }
 
-.openerp .oe_notes .oe_kanban_record .oe_kanban_card   {
-    -webkit-transform: rotate(-2deg);
-    -o-transform: rotate(-2deg);
-    -moz-transform:rotate(-2deg);
+@font-face {
+  font-family: "EntypoRegular";
+  src: url("/web/static/src/font/entypo-webfont.eot") format("eot");
+  src: url("/web/static/src/font/entypo-webfont.eot?#iefix") format("embedded-opentype");
+  src: url("/web/static/src/font/entypo-webfont.woff") format("woff");
+  src: url("/web/static/src/font/entypo-webfont.ttf") format("truetype");
+  src: url("/web/static/src/font/entypo-webfont.svg") format("svg") active;
+  font-weight: normal;
+  font-style: normal;
 }
 
-.openerp .oe_notes .oe_kanban_record:nth-of-type(even) .oe_kanban_card   {
-    -webkit-transform: rotate(1deg);
-    -o-transform: rotate(1deg);
-    -moz-transform:rotate(1deg);
-}
+@-moz-keyframes bounce {
+  0% {
+    -moz-transform: scale(0);
+    opacity: 0;
+  }
 
-.openerp .oe_notes .oe_kanban_record:nth-of-type(3n) .oe_kanban_card   {
-    -webkit-transform: rotate(4deg);
-    -o-transform: rotate(4deg);
-    -moz-transform:rotate(4deg);
-}
+  50% {
+    -moz-transform: scale(1.3);
+    opacity: 0.4;
+  }
+
+  75% {
+    -moz-transform: scale(0.9);
+    opacity: 0.7;
+  }
 
-.openerp .oe_notes .oe_kanban_column:nth-of-type(even) .oe_kanban_record .oe_kanban_card   {
-    -webkit-transform: rotate(2deg);
-    -o-transform: rotate(2deg);
-    -moz-transform:rotate(2deg);
+  100% {
+    -moz-transform: scale(1);
+    opacity: 1;
+  }
 }
 
-.openerp .oe_notes .oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(even) .oe_kanban_card   {
-    -webkit-transform: rotate(-3deg);
-    -o-transform: rotate(-3deg);
-    -moz-transform:rotate(-3deg);
+@-webkit-keyframes bounce {
+  0% {
+    -webkit-transform: scale(0);
+    opacity: 0;
+  }
+
+  50% {
+    -webkit-transform: scale(1.3);
+    opacity: 0.4;
+  }
+
+  75% {
+    -webkit-transform: scale(0.9);
+    opacity: 0.7;
+  }
+
+  100% {
+    -webkit-transform: scale(1);
+    opacity: 1;
+  }
 }
 
-.openerp .oe_notes .oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card   {
-    -webkit-transform: rotate(1deg);
-    -o-transform: rotate(1deg);
-    -moz-transform:rotate(1deg);
+.oe_kanban_color_2 {
+  background-color: red;
 }
 
-.openerp .oe_notes .oe_kanban_column:nth-of-type(3n) .oe_kanban_record .oe_kanban_card   {
-    -webkit-transform: rotate(-2deg);
-    -o-transform: rotate(-2deg);
-    -moz-transform:rotate(-2deg);
+.oe_kanban_column .note_text_line_through {
+  text-decoration: line-through;
 }
 
-.openerp .oe_notes .oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(even) .oe_kanban_card   {
-    -webkit-transform: rotate(1deg);
-    -o-transform: rotate(1deg);
-    -moz-transform:rotate(1deg);
+.openerp .oe_fold_column .oe_kanban_card_fancy {
+  text-decoration: none;
+  color: black;
+  display: block;
+  padding: 1em;
+  margin-right: 1em;
+  margin-bottom: 1em;
+  -moz-box-shadow: 5px 5px 7px #212121;
+  -webkit-box-shadow: 5px 5px 7px rgba(33, 33, 33, 0.7);
+  box-shadow: 5px 5px 7px rgba(33, 33, 33, 0.7);
 }
 
-.openerp .oe_notes .oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card   {
-    -webkit-transform: rotate(-1deg);
-    -o-transform: rotate(-1deg);
-    -moz-transform:rotate(-1deg);
+.openerp .oe_kanban_record .oe_kanban_card_fancy {
+  -webkit-transform: rotate(-2deg);
+  -o-transform: rotate(-2deg);
+  -moz-transform: rotate(-2deg);
+}
+.openerp .oe_kanban_record:nth-of-type(even) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(1deg);
+  -o-transform: rotate(1deg);
+  -moz-transform: rotate(1deg);
+}
+.openerp .oe_kanban_record:nth-of-type(3n) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(4deg);
+  -o-transform: rotate(4deg);
+  -moz-transform: rotate(4deg);
+}
+.openerp .oe_kanban_column:nth-of-type(even) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(2deg);
+  -o-transform: rotate(2deg);
+  -moz-transform: rotate(2deg);
+}
+.openerp .oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(even) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(-3deg);
+  -o-transform: rotate(-3deg);
+  -moz-transform: rotate(-3deg);
+}
+.openerp .oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(1deg);
+  -o-transform: rotate(1deg);
+  -moz-transform: rotate(1deg);
+}
+.openerp .oe_kanban_column:nth-of-type(3n) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(-2deg);
+  -o-transform: rotate(-2deg);
+  -moz-transform: rotate(-2deg);
+}
+.openerp .oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(even) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(1deg);
+  -o-transform: rotate(1deg);
+  -moz-transform: rotate(1deg);
+}
+.openerp .oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(-1deg);
+  -o-transform: rotate(-1deg);
+  -moz-transform: rotate(-1deg);
 }
 
-.openerp .oe_notes .oe_kanban_column .oe_fold_column .oe_kanban_card:hover,
-.openerp .oe_notes .oe_kanban_column .oe_fold_column .oe_kanban_card:focus {
-    box-shadow:10px 10px 7px rgba(0,0,0,.7);
-    -moz-box-shadow:10px 10px 7px rgba(0,0,0,.7);
-    -webkit-box-shadow: 10px 10px 7px rgba(0,0,0,.7);
-    -webkit-transform: rotate(0);
-    -moz-transform: rotate(0);
-    -o-transform: rotate(0);
-    position:relative;
-    z-index:5;
+.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card_fancy:hover,
+.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card_fancy:focus {
+  box-shadow: 10px 10px 7px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 10px 10px 7px rgba(0, 0, 0, 0.7);
+  -webkit-box-shadow: 10px 10px 7px rgba(0, 0, 0, 0.7);
+  position: relative;
+  z-index: 5;
+  -webkit-transform: rotate(0);
+  -o-transform: rotate(0);
+  -moz-transform: rotate(0);
 }
diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass
index cd04015dcbb..56aa91abc44 100644
--- a/addons/note/static/src/css/note.sass
+++ b/addons/note/static/src/css/note.sass
@@ -42,10 +42,10 @@ $sheet-max-width: 860px
   background-color: $startColor
   background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */
   background-image: -webkit-linear-gradient(top, $startColor, $endColor) /* Chrome 10+, Saf5.1+, iOS 5+ */
-  background-image:    -moz-linear-gradient(top, $startColor, $endColor) /* FF3.6 */
-  background-image:     -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */
-  background-image:      -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */
-  background-image:         linear-gradient(to bottom, $startColor, $endColor)
+  background-image:   -moz-linear-gradient(top, $startColor, $endColor) /* FF3.6 */
+  background-image:    -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */
+  background-image:     -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */
+  background-image:        linear-gradient(to bottom, $startColor, $endColor)
 
 @mixin radial-gradient($gradient)
   background-position: center center
@@ -93,7 +93,7 @@ $sheet-max-width: 860px
   font-size: 1px
   letter-spacing: -1px
   color: transparent
-  &:before
+  &: before
     font: 21px "mnmliconsRegular"
     content: $icon-name
     color: $color
@@ -131,7 +131,79 @@ $sheet-max-width: 860px
 
 
 .oe_kanban_color_2
-  background-color:red
+  background-color: red
 				  
-// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
-
+// au BufWritePost,FileWritePost *.sass : !sass --style expanded --line-numbers <afile> > "%: p: r.css"
+
+.oe_kanban_column
+  .note_text_line_through
+    text-decoration: line-through
+
+
+.openerp
+  .oe_fold_column
+    .oe_kanban_card_fancy 
+      text-decoration: none
+      color: #000
+      display: block
+      padding: 1em
+      margin-right: 1em
+      margin-bottom: 1em
+      -moz-box-shadow: 5px 5px 7px rgba(33,33,33,1)
+      -webkit-box-shadow: 5px 5px 7px rgba(33,33,33,.7)
+      box-shadow: 5px 5px 7px rgba(33,33,33,.7)
+
+
+@mixin rotate($a)
+  -webkit-transform: rotate($a)
+  -o-transform: rotate($a)
+  -moz-transform: rotate($a)
+
+.openerp
+  .oe_kanban_record
+    .oe_kanban_card_fancy 
+      @include rotate(-2deg)
+  .oe_kanban_record:nth-of-type(even)
+    .oe_kanban_card_fancy 
+      @include rotate(1deg)
+  .oe_kanban_record:nth-of-type(3n)
+    .oe_kanban_card_fancy 
+      @include rotate(4deg)
+  .oe_kanban_column:nth-of-type(even)
+    .oe_kanban_card_fancy 
+      @include rotate(2deg)
+  .oe_kanban_column:nth-of-type(even)
+    .oe_kanban_record:nth-of-type(even)
+      .oe_kanban_card_fancy 
+        @include rotate(-3deg)
+  .oe_kanban_column:nth-of-type(even)
+    .oe_kanban_record:nth-of-type(3n)
+      .oe_kanban_card_fancy 
+        @include rotate(1deg)
+  .oe_kanban_column:nth-of-type(3n)
+    .oe_kanban_card_fancy 
+      @include rotate(-2deg)
+  .oe_kanban_column:nth-of-type(3n)
+    .oe_kanban_record:nth-of-type(even)
+      .oe_kanban_card_fancy 
+        @include rotate(1deg)
+  .oe_kanban_column:nth-of-type(3n)
+    .oe_kanban_record:nth-of-type(3n)
+      .oe_kanban_card_fancy 
+        @include rotate(-1deg)
+
+
+@mixin oe_kanban_card_fancy
+  box-shadow: 10px 10px 7px rgba(0,0,0,.7)
+  -moz-box-shadow: 10px 10px 7px rgba(0,0,0,.7)
+  -webkit-box-shadow: 10px 10px 7px rgba(0,0,0,.7)
+  position: relative
+  z-index: 5
+  @include rotate(0)
+
+.openerp
+  .oe_kanban_column
+    .oe_fold_column
+      .oe_kanban_card_fancy:hover,
+      .oe_kanban_card_fancy:focus 
+        @include oe_kanban_card_fancy