Merge branch 'taille_boue' into 'master'

Modification de la taille des bouées + résolution du problème de des bouées qui se chevauchent.

See merge request !32

app/templates/browse.html

@@ -25,14 +25,14 @@
 
 					<div id='hierarchy' class="panel panel-primary">
 						<div class="panel-heading title">
-							<span style="margin-left: 17%;"></span><span class="glyphicon glyphicon-tags"></span>Labels
+							<span style="margin-left: 10%; margin-right: 5%"><span class="glyphicon glyphicon-tags"></span>Labels</span>
 							<span v-if='this.labels_language == "FR"'>
-								<img style="height:25px; width:25px; margin-left: 6%; margin-right: 5%;" src="static/boue_france.png">
+								<img style="height:25px; width:25px; margin-right: 3%;" src="static/boue_france.png">
 								<img @click="change_labels_language('US')" style="height:25px; width:25px;" src="static/boue_usa_black.png" onmouseover="this.src='static/boue_usa.png'" onmouseout="this.src='static/boue_usa_black.png'">
 							</span>
 							<span v-else>
-								<img @click="change_labels_language('FR')" style="height:30px; width:30px; margin-left: 6%; margin-right: 5%;" src="static/boue_france_black.png" onmouseover="this.src='static/boue_france.png'" onmouseout="this.src='static/boue_france_black.png'">
-								<img @click="change_labels_language('FR')" style="height:30px; width:30px;" src="static/boue_usa.png" onmouseover="this.src='static/boue_usa_black.png'" onmouseout="this.src='static/boue_usa.png'">
+								<img @click="change_labels_language('FR')" style="height:30px; width:25px; margin-left: 6%; margin-right: 5%;" src="static/boue_france_black.png" onmouseover="this.src='static/boue_france.png'" onmouseout="this.src='static/boue_france_black.png'">
+								<img @click="change_labels_language('FR')" style="height:30px; width:25px;" src="static/boue_usa.png" onmouseover="this.src='static/boue_usa_black.png'" onmouseout="this.src='static/boue_usa.png'">
 							</span>
 						</div>