diff -r d6fa8041a90b -r 0e6e631718ee integration/css/style.css --- a/integration/css/style.css Fri May 24 17:24:11 2013 +0200 +++ b/integration/css/style.css Mon May 27 15:24:46 2013 +0200 @@ -22,8 +22,8 @@ .tab-behavior{text-align: center;} .tab-behavior li{display: inline-block; float: none;} td ul{margin-bottom: 0;} -.modal.popup{width: 970px; margin-left: -485px;} -.popup .modal-body{max-height: none;} +.modal.popup{width: 970px; margin-left: -485px; height: 80%;} +.popup .modal-body{max-height: none; background-color: #fff; height: 80%;} .previsualisation img{max-height: 400px;} .modal-menu{margin: 0;} .modal h4{border-bottom: 1px solid #EEE; padding-bottom: 8px;} @@ -39,13 +39,8 @@ .chapter-widget-info{margin-bottom: 20px;} .chapter-widget form{ margin: 0;} .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; -} +.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;} @@ -58,10 +53,7 @@ .list-chapter-wrap table, .list-annotation-wrap table{margin-bottom: 0;} .list-chapter-wrap h4, .form-chapter-edit h4, .list-annotation-wrap h4, .title-section{padding: 10px; border-bottom: 1px solid; margin-bottom: 10px;} .add-annotation-wrap, form.form-info-general-annotation{padding: 10px 0;} -form.form-info-general-annotation ul.tagit { - margin-left: 0px; - width: 195px; -} +form.form-info-general-annotation ul.tagit {margin-left: 0px;width: 195px;} form.form-info-general-annotation textarea{min-height:100px; height: 100px;min-width: 196px;} .add-annotation-wrap {margin-bottom: 20px; padding-top: 0;} @@ -102,6 +94,7 @@ .list-current-annotations li{list-style: none; margin-top: 4px;} .list-current-annotations a{text-align:center; line-height:20px; color:#FFF;display: inline-block; background-color: #589; width: 20px; height: 20px; } .list-current-annotations a:hover{text-decoration: none;} +.annotation-son-content textarea{max-width: 206px;} /* Tangle */ .time-tangle { color: #2c3e50; cursor: w-resize; position: relative;