# HG changeset patch # User Anthony Ly # Date 1370514959 -7200 # Node ID 8f954a0d6031678e7e0f17f9c1aab1a91a3a8bba # Parent 5dfa74fcec4bd0e9e725e57c6473f07dbb0c1f8c edit title and descripttion video diff -r 5dfa74fcec4b -r 8f954a0d6031 integration/css/style.css --- a/integration/css/style.css Wed Jun 05 12:05:53 2013 +0200 +++ b/integration/css/style.css Thu Jun 06 12:35:59 2013 +0200 @@ -44,16 +44,17 @@ .project-action a:last-child{margin-right: 20px;} .chapter-widget-info{margin-bottom: 20px;} .chapter-widget form{ margin: 0;} -.form-info-general-annotation{background-color: #ecf0f1;} +#list-annotations{ background-color: #fff;} +.form-info-general-annotation{ border-bottom: 1px solid #bdc3c7;} .chapter-widget input, .form-info-general-annotation input, .form-info-general-annotation textarea{width: 196px; max-width: 196px; } .chapter-widget textarea{width: 426px; max-width: 426px; min-width: 426px; height: 20px;-webkit-transition: height .3s ease;-moz-transition: height .3s ease;transition: height .3s ease;} .form-chapter-edit{} .chapter-widget-info table{margin: 0; padding-top: 40px; } .chapter-widget table td{} .chapter-widget textarea:focus{height: 100px;} -.chapitre-cut-wrap{position: relative; height: 50px; margin-bottom: 10px;} -.btn-cut-chapter{position: absolute;top: 20px;left: 11px; width: 40px;} -.indicateur-chapter, .indicateur-annotation{z-index:100; left:10px; width: 1px; height: 100%;background-color: #000; position: absolute;} +.chapitre-cut-wrap{position: relative; height: 70px; margin-bottom: 10px;} +.btn-cut-chapter{height:40px;position: absolute;top: 20px;left: 11px; width: 40px;} +.indicateur-chapter, .indicateur-annotation{z-index:999; left:10px; width: 1px; height: 100%;background-color: #000; position: absolute;} .chapter-segments {overflow:hidden; width: 100%; height: 20px; margin: 0; position: relative;} .chapter-segments li{position: absolute; top: 0; cursor:pointer; float: left; list-style: none; line-height: 20px; height: 20px; text-align: center; overflow: hidden;} .list-chapter-wrap, .list-annotation-wrap, .section{background-color: #F5F5F5; border: 1px solid #E5E5E5;} @@ -67,7 +68,7 @@ .slider-duration{width: 435px;display: inline-block; margin-bottom: 10px;} .btn-save-annotation{margin-right: 10px;} -.edit-annotation-diaporama{} +.tab-pane.active{background-color: #F5F5F5;} .edit-annotation-title{border-bottom: 1px solid #E5E5E5; margin-bottom: 20px;} .edit-annotation-title h3{display: inline-block;} .edit-annotation-title span{text-align: right; line-height: 60px;} @@ -90,8 +91,8 @@ .slider-duration.ui-slider.ui-slider-horizontal.ui-widget.ui-widget-content.ui-corner-all{ background: #202020;} .timeline-annotations-wrap{position: relative;background-color: #202020;} .timeline-annotations{width: 460px;height: auto; position: relative; margin: 0; padding-top: 4px;} -.timeline-annotations li{display: block; width: 460px;height: 10px; position: relative; padding-bottom: 4px;} -.timeline-annotations .annotation{ color:#000; text-align:center; font-size : 10px; overflow: hidden; line-height: 9px; width: 10px; height: 10px; background-color: #c0392b; position: absolute; top:0px;} +.timeline-annotations li{display: block; width: 460px;height: 12px; position: relative; padding-bottom: 4px;} +.timeline-annotations .annotation{ color:#000; text-align:center; font-size : 10px; overflow: hidden; line-height: 12px; width: 10px; height: 12px; background-color: #c0392b; position: absolute; top:0px;} ul.tagit{margin-left: 10px;-webkit-border-radius: 0px; -moz-border-radius: 0px; border-radius: 0px;} @@ -115,8 +116,10 @@ #templates{display: none;} .title-slideshow-row{word-wrap: break-word;width: 76px;} -.description-slideshow-row{word-wrap: break-word; width: 180px;} -.description-slideshow-row textarea{width: 164px; max-width: 164px; height: 164px;} +.title-slideshow-row input{width: 70px;} +.description-slideshow-row{word-wrap: break-word; width: 180px; } +.description-slideshow-row span{max-height: 100px; display: inline-block; overflow: auto;} +.description-slideshow-row textarea{width: 164px; max-width: 164px; height: 100px;} /* Tangle */ .time-tangle { color: #2c3e50; cursor: w-resize; position: relative; diff -r 5dfa74fcec4b -r 8f954a0d6031 integration/edition.html --- a/integration/edition.html Wed Jun 05 12:05:53 2013 +0200 +++ b/integration/edition.html Thu Jun 06 12:35:59 2013 +0200 @@ -51,7 +51,7 @@
Voir aperçu - Sauvegarder le projet + Sauvegarder le projet
@@ -79,8 +79,10 @@
@@ -656,7 +658,7 @@
- sec + sec
@@ -721,8 +723,12 @@