Mercurial Mercurial > iconolab / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small css change on item list + bootstrap buttons on annotation form and annotation detail
authordurandn
Fri, 09 Dec 2016 14:41:46 +0100
changeset 273 e91d36cbdfcf
parent 272 c838f9ee207a
child 274 ad4e1e9bc75d
small css change on item list + bootstrap buttons on annotation form and annotation detail
src/iconolab/static/iconolab/css/iconolab.css file | annotate | diff | comparison | revisions
src/iconolab/templates/iconolab/change_annotation.html file | annotate | diff | comparison | revisions
src/iconolab/templates/iconolab/detail_annotation.html file | annotate | diff | comparison | revisions 
--- a/src/iconolab/static/iconolab/css/iconolab.css	Fri Dec 09 14:40:56 2016 +0100
+++ b/src/iconolab/static/iconolab/css/iconolab.css	Fri Dec 09 14:41:46 2016 +0100
@@ -207,7 +207,7 @@
 li.image-list-li{
 	margin-bottom: 5px; 
 	width: 370px; 
-	height: 400px; 
+	height: 430px; 
 	vertical-align:middle; 
 	padding:5px;
 }
--- a/src/iconolab/templates/iconolab/change_annotation.html	Fri Dec 09 14:40:56 2016 +0100
+++ b/src/iconolab/templates/iconolab/change_annotation.html	Fri Dec 09 14:41:46 2016 +0100
@@ -10,7 +10,7 @@
 		
 		<div v-show='!formView' style="display:none" class="editor-wrapper col-md-12">
 			<div class="col-md-12 no-padding">
-				<p @click="cancel" class="btn btn-link pull-right"><i class="fa fa-close"></i> Annuler</p>
+				<p @click="cancel" class="pull-right btn btn-default btn-sm"><i class="fa fa-close"></i> Annuler</p>
 			</div>
 			<div class='col-md-2'>
 				<ul class="form-drawing-wrapper list-inline">
@@ -79,12 +79,12 @@
 					
 					{% endthumbnail %}
 				</div>
-				<ul class="inline">
-					<li @click="showEditor" class="showPointer"> <i class='fa fa-edit'></i> Editer le fragment</li>
-					<li v-show="!displayMask" @click="highLightZone" class="showPointer show-zone"> <i class='fa fa-eye-slash'></i> Afficher la zone</li>
-					<li v-show="displayMask" @click="highLightZone" class="showPointer hide-zone"> <i class='fa fa-eye-slash'></i> Masquer la zone</li>
-					<li class="zoom-link" v-if="canZoom" @click="zoom('in')"><i class="fa fa-zoom-in"></i>Zoomer</li>
-					<li class="zoom-link" v-if="!canZoom" @click="zoom('out')"><i class="fa fa-zoom-out"></i>Dezoomer</li>
+				<ul class="list-inline list-unstyled">
+					<li @click="showEditor" class="showPointer btn btn-default btn-sm"> <i class='fa fa-edit'></i> Editer le fragment</li>
+					<li v-show="!displayMask" @click="highLightZone" class="showPointer show-zone btn btn-default btn-sm"> <i class='fa fa-eye-slash'></i> Afficher la zone</li>
+					<li v-show="displayMask" @click="highLightZone" class="showPointer hide-zone btn btn-default btn-sm"> <i class='fa fa-eye-slash'></i> Masquer la zone</li>
+					<li class="zoom-link btn btn-default btn-sm" v-if="canZoom" @click="zoom('in')"><i class="fa fa-zoom-in"></i>Zoomer</li>
+					<li class="zoom-link btn btn-default btn-sm" v-if="!canZoom" @click="zoom('out')"><i class="fa fa-zoom-out"></i>Dezoomer</li>
 				</ul>
 			</div>
 
--- a/src/iconolab/templates/iconolab/detail_annotation.html	Fri Dec 09 14:40:56 2016 +0100
+++ b/src/iconolab/templates/iconolab/detail_annotation.html	Fri Dec 09 14:41:46 2016 +0100
@@ -26,7 +26,8 @@
 						
 					{% endthumbnail %}
 				</div>
-        	<p @click="toggleZoomView" style="padding-top:2px"><i class="fa fa-search-plus showPointer"></i></p>
+            <br>
+        	<p class="btn btn-default btn-sm" @click="toggleZoomView" style="padding-top:2px"><i class="fa fa-search-plus showPointer"></i></p>
             <a class="btn btn-default btn-sm" href="{% url 'item_detail' collection_name image.item.item_guid %}"><i class="fa fa-eye" aria-hidden="true"></i> Voir l'objet de cette annotation</a>
             <a class="btn btn-default btn-sm" href="{% url 'image_detail' collection_name image_guid %}"><i class="fa fa-picture-o" aria-hidden="true"></i> Voir les annotations sur l'image</a>
iconolab