Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/web/clavettes

diff --git a/css/habillage.css b/css/habillage.css
index 0136a1f..28b4cb1 100644 (file)
--- a/css/habillage.css
+++ b/css/habillage.css
@@ -147,9 +147,6 @@ p {
 #news {
   overflow: hidden; }
 
-#news img {
-  height: 350px; }
-
 .article {
   background-color: #ffaa7f;
   margin: 0 10px 15px 10px; }

diff --git a/css/habillage.scss b/css/habillage.scss
index 5ca5f60..3261254 100644 (file)
--- a/css/habillage.scss
+++ b/css/habillage.scss
@@ -180,10 +180,6 @@ p{
        overflow: hidden;
 }
 
-#news img{
-       height:350px;
-}
-
 .article{
        background-color:#ffaa7f;
        margin:0 10px 15px 10px;

diff --git a/sommaire.html b/sommaire.html
index 28cadf4..66bf984 100644 (file)
--- a/sommaire.html
+++ b/sommaire.html
@@ -41,7 +41,7 @@
             <div id="news">
                 <BOUCLE_articles(ARTICLES){0,10}{!par date}>
                 <div class="article">
-                    <a href="#">[(#LOGO_ARTICLE_RUBRIQUE|inserer_attribut{alt,"logo"})]</a>
+                    <a href="#">[(#LOGO_ARTICLE_RUBRIQUE|inserer_attribut{alt,"logo"}|image_reduire{150,150})]</a>
                     <a href="#"><h1>#TITRE</h1></a>
                     <BOUCLE_rub(RUBRIQUES){id_rubrique=#ID_RUBRIQUE}>
                     <a href="#"><h3>[(#_articles:DATE|affdate)] - #TITRE</h3></a>
@@ -56,7 +56,7 @@
 <!--3EME COLONNE-->
         <div class="col-12 col-m-12 col-l-4">
                 <div class="map">
-                    [(#MODELE{carte_gis, zoom=12, fullscreen=oui})]
+                    [(#MODELE{carte_gis, zoom=12, fullscreen=oui, height=100%})]
                 </div>
         </div>
         <div class="col-12 col-m-12 col-l-4">