correction du responsive

PnX-SI · Oct 8, 2019 · f0feb55 · f0feb55
1 parent 116404e
commit f0feb55
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 53 deletions.
diff --git a/static/css/atlas.css b/static/css/atlas.css
@@ -55,8 +55,8 @@ body {
 }
 
 #page {
-  padding-left: 60px;
-  padding-right: 0px;
+  padding-left: 70px;
+  padding-right: 10px;
   margin-top: 25px;
 }
 

diff --git a/static/custom/templates/introduction.html.sample b/static/custom/templates/introduction.html.sample
@@ -1,4 +1,3 @@
-<div class="col-sm-12">
 	<div class="panel panel-default">
 		<div class="row">
 			<div class="col-lg-4 col-md-4 col-sm-12 col-xs-12 textIntroduction">
@@ -20,4 +19,3 @@
 			</div>
 		</div>
 	</div>
-</div>
diff --git a/templates/index.html b/templates/index.html
@@ -46,64 +46,64 @@
 
 			{% if configuration.AFFICHAGE_STAT_GLOBALES %}
 			<!-- Statistiques globales -->
-			<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
 					<div class="panel panel-default stat-panel">
 						<div class="panel-heading padding-sm ">
 								<strong><h3 class="title-spaced"> <i class="fas fa-chart-line icon-color-title">&nbsp;</i> En quelques chiffres</h3></strong>
 						</div>
-						<div class="row">
-							<div class ="col-lg-3 col-md-3 col-sm-12 col-xs-12 stat-object">
-								<div class="stat-thumbnail border">
-									<i class="fas fa-search font-icon blue"></i>	<input id="hiddenInputTaxonStat" type="hidden" name="cd_ref">
-										<h1 class="large muted">{{stat.nbTotalObs | pretty}}</h1>
-									<h4 class="text-muted"> {{ 'observations' if stat.nbTotalObs > 1 else 'observation'}}</h4>
-									<p><a id="localScroll" href="#DernieresObservations" class="btn btn-default" role="button">Voir les dernières observations</a></p>
+						<div class="panel-body">
+							<div class="row">
+								<div class ="col-lg-3 col-md-3 col-sm-6 col-xs-12 stat-object">
+									<div class="stat-thumbnail border">
+										<i class="fas fa-search font-icon blue"></i>	<input id="hiddenInputTaxonStat" type="hidden" name="cd_ref">
+											<h1 class="large muted">{{stat.nbTotalObs | pretty}}</h1>
+										<h4 class="text-muted"> {{ 'observations' if stat.nbTotalObs > 1 else 'observation'}}</h4>
+										<p><a id="localScroll" href="#DernieresObservations" class="btn btn-default" role="button">Voir les dernières observations</a></p>
+									</div>
 								</div>
-							</div>
-							<div class = "col-lg-3 col-md-3 col-sm-12 col-xs-12 stat-object">
-								<div class="stat-thumbnail border">
-									<i class="fas fa-leaf font-icon"></i>									
-									<h1 class="large muted">{{stat.nbTotalTaxons | pretty}}</h1>
-									<h4 class="text-muted"> {{ 'espèces' if stat.nbTotalTaxons > 1 else 'espèce' }}</h4>
-									<form method="POST" id="searchFormTaxonsStat" class="navbar-form" role="search">
-										<div class="form-group has-feedback">
-											<input id="searchTaxonsStat" type="text" class="form-control" placeholder="Rechercher une espèce &nbsp; &nbsp; &nbsp;" loading="false" />
-											<i class="glyphicon glyphicon-search form-control-feedback"></i>
-											<input id="hiddenInputTaxonStat" type="hidden" name="cd_ref">
-										</div>
-													</form>
+								<div class = "col-lg-3 col-md-3 col-sm-6 col-xs-12 stat-object">
+									<div class="stat-thumbnail border">
+										<i class="fas fa-leaf font-icon"></i>									
+										<h1 class="large muted">{{stat.nbTotalTaxons | pretty}}</h1>
+										<h4 class="text-muted"> {{ 'espèces' if stat.nbTotalTaxons > 1 else 'espèce' }}</h4>
+										<form method="POST" id="searchFormTaxonsStat" class="navbar-form" role="search">
+											<div class="form-group has-feedback">
+												<input id="searchTaxonsStat" type="text" class="form-control" placeholder="Rechercher une espèce &nbsp; &nbsp; &nbsp;" loading="false" />
+												<i class="glyphicon glyphicon-search form-control-feedback"></i>
+												<input id="hiddenInputTaxonStat" type="hidden" name="cd_ref">
+											</div>
+														</form>
+									</div>
 								</div>
-							</div>
-							<div class ="col-lg-3 col-md-3 col-sm-12 col-xs-12 stat-object">
-								<div class="stat-thumbnail border">
-									<i class="fas fa-map-signs font-icon blue"></i>
-									<h1 class="large muted">{{stat.town | pretty}}</h1>
-									<h4 class="text-muted"> {{ 'communes' if stat.town > 1 else 'commune' }}</h4>
-									<form method="POST" onsubmit="completeAction('#searchFormCommunesStat', hiddenInputCommunesStat)" id='searchFormCommunesStat' action=""  class="navbar-form" role="search">
-										<div class="form-group has-feedback">
-											<input id="searchCommunesStat" type="text" class="form-control" placeholder="Rechercher une commune" />
-											<i class="glyphicon glyphicon-search form-control-feedback"></i>
-											<input id="hiddenInputCommunesStat" type="hidden" name="insee">
-										</div>
-									</form>
+								<div class ="col-lg-3 col-md-3 col-sm-6 col-xs-12 stat-object">
+									<div class="stat-thumbnail border">
+										<i class="fas fa-map-signs font-icon blue"></i>
+										<h1 class="large muted">{{stat.town | pretty}}</h1>
+										<h4 class="text-muted"> {{ 'communes' if stat.town > 1 else 'commune' }}</h4>
+										<form method="POST" onsubmit="completeAction('#searchFormCommunesStat', hiddenInputCommunesStat)" id='searchFormCommunesStat' action=""  class="navbar-form" role="search">
+											<div class="form-group has-feedback">
+												<input id="searchCommunesStat" type="text" class="form-control" placeholder="Rechercher une commune" />
+												<i class="glyphicon glyphicon-search form-control-feedback"></i>
+												<input id="hiddenInputCommunesStat" type="hidden" name="insee">
+											</div>
+										</form>
+									</div>
 								</div>
-							</div>
-							<div class ="col-lg-3 col-md-3 col-sm-12 col-xs-12 stat-object">
-								<div class="stat-thumbnail">
-									<i class="fas fa-camera font-icon"></i>
-										<h1 class="large muted">{{stat.photo | pretty}}</h1>
-									<h4 class="text-muted"> {{ 'photos' if stat.photo > 1 else 'photo' }}</h4>
-									<p><a href="{{url_for('main.photos')}}" class="btn btn-default" role="button">Galerie photos</a></p>
+								<div class ="col-lg-3 col-md-3 col-sm-6 col-xs-12 stat-object">
+									<div class="stat-thumbnail">
+										<i class="fas fa-camera font-icon"></i>
+											<h1 class="large muted">{{stat.photo | pretty}}</h1>
+										<h4 class="text-muted"> {{ 'photos' if stat.photo > 1 else 'photo' }}</h4>
+										<p><a href="{{url_for('main.photos')}}" class="btn btn-default" role="button">Galerie photos</a></p>
+									</div>
 								</div>
 							</div>
-						</div>
+					</div>
 				</div>
-			</div>
+
 			{% endif %}
 
 			{% if customStatMedias != None and configuration.AFFICHAGE_RANG_STAT %}
 			<!-- Statistiques par rang taxonomique -->
-			<div class="col-sm-12">
 					<div class="panel panel-default">
 							<div class="panel-heading padding-sm ">
 									<h3 class="title-spaced"><span class="glyphicon glyphicon-eye-open icon-color-title"></span> &nbsp;Espèces à découvrir</h3>
@@ -155,13 +155,12 @@ <h2 class="overlay-obs">{{customStatMedias[i][j].nb_obs | pretty}} observations<
 			{% endfor %}
 					</div>
 				</div>
-			</div>
 			{% endif %}
 
 			{% if configuration.AFFICHAGE_DERNIERES_OBS %}
 			<!-- Dernières espèces observées (Carte et liste) -->
-			<div class="col-sm-12" id="DernieresObservations">
-					<div class="panel panel-default " >
+			<div id="DernieresObservations">
+					<div class="panel panel-default" >
 					  	<div class="panel-heading padding-sm ">
 							  <h3 class="title-spaced"> <i class="fas fa-binoculars icon-color-title"></i> 
 								{{configuration.TEXT_LAST_OBS}} {{observations | length}} {{ 'observations' if observations | length > 1 else 'observation' }}
@@ -214,7 +213,7 @@ <h3 class="title-spaced"> <i class="fas fa-binoculars icon-color-title"></i>
 
 			{% if configuration.AFFICHAGE_EN_CE_MOMENT %}
 			<!-- ESPECES PERIODE -->
-			<div class="col-sm-12" id="mostViewNow">
+			<div id="mostViewNow">
 				<div class="panel panel-default">
 					<div class="panel-heading">
 						<h3 class="title-spaced">A voir en ce moment 
@@ -247,7 +246,6 @@ <h2>{{tax.taxonName}}</h2>
 			</div>
 			{% endif %}
 
-		</div>
 
         {% if configuration.AFFICHAGE_FOOTER %}
 			{% include 'static/custom/templates/footer.html' %}