--- a/integration/css/edition.css	Mon Oct 29 18:11:09 2012 +0100
+++ b/integration/css/edition.css	Tue Oct 30 18:44:45 2012 +0100
@@ -33,7 +33,7 @@
 	color: #333333;
 	font-size: 14px;
 }
-.title-video-wrap p.time-length span{
+.mashup-total-duration {
 	color: #de2500;
 }
 /* popin - update-title */
@@ -122,32 +122,22 @@
     display: none;
 }
 
+/* frise */
 .frise{
 	width: 458px;
-	position: relative;
 	height: 22px;
 	overflow: hidden;
-}
-.frise .segment{
-	height: 22px;
-}
-.frise span.indication{
-	height: 22px;
-	line-height: 22px;
-}
-/* frise */
-.frise{
 	position: relative;
 	border: 1px solid #333333;
 }
-.segments,.indications{
+.frise-segments,.frise-indications{
 	width: 100%;
 	height: 100%;
 	position: absolute;
 	top: 0;
 	left: 0;
 }
-.indications{
+.frise-indications{
 	z-index: 2;
 }
 .aucun-segment{
@@ -157,8 +147,10 @@
 	line-height: 20px;
 	width: 100%;
 	z-index:0;
+	background: #CCCCCC;
 }
-.frise .segment{
+.frise-segment{
+	height: 22px;
 	position: absolute;
 	background-image: url(../img/border-right-segment.png);
 	background-repeat: repeat-y;
@@ -167,15 +159,17 @@
   	-webkit-box-shadow: inset 0px 2px 2px 0px #333;
   	box-shadow: inset 0px 2px 2px 0px #333;
 }
-.frise .segment:first-child{
+.frise-segment:first-child{
 	-moz-box-shadow: inset 2px 2px 2px 0px #333;
   	-webkit-box-shadow: inset 2px 2px 2px 0px #333;
   	box-shadow: inset 2px 2px 2px 0px #333;
 }
-.frise .segment:last-child{
+.frise-segment:last-child{
 	background-image: none;
 }
-.frise span.indication{
+.frise-indication{
+	height: 22px;
+	line-height: 22px;
 	display: inline-block;
 	position: absolute;
 	color: #FFF;
@@ -187,6 +181,9 @@
 	background: url(../img/bg-indication.png) 15px 0 no-repeat;
 	margin-left: -15px;
 }
+.frise-position {
+    width: 1px; margin-left: -0.5px; position: absolute; height: 100%; background: #FF00FC;
+}
 /* col-middle - bloc-segmentation */
 .bloc-segmentation{
 	position: relative;
@@ -417,10 +414,10 @@
 	position: relative;
 	height: 20px;
 }
-.col-right .frise .segment{
+.col-right .frise-segment{
 	height: 20px;
 }
-.col-right .frise .indication{
+.col-right .frise-indication{
 	height: 20px;
 	line-height: 20px;
 }
@@ -435,11 +432,14 @@
 .mashup-description img.pointer{
 	right: 36px;
 }
-.mashup-description h2{
+.annotation-title {
 	color: #de2500;
 	font-size: 14px;
 	font-weight: bold;
 }
+.annotation-time {
+    color: #7628DF;
+}
 .mashup-description table{
 	font-size: 12px;
 }
@@ -532,6 +532,8 @@
 .item-video img{
 	float: left;
 	margin-right: 4px;
+	max-width: 80px;
+	max-height: 60px;
 	box-shadow: 2px 2px 2px #333333;
 }
 .item-video .video-info{
@@ -602,6 +604,7 @@
     background: url(../img/publier-button-sprite.png) 0 0 no-repeat;
     left: 382px;
     top: 10px;
+    z-index: 4;
 }
 a.publier-button:hover{
     background-position: 0 -67px;