Skip to content
Snippets Groups Projects
Commit 2fd0693b authored by Pierre-Alexandre RACINE's avatar Pierre-Alexandre RACINE
Browse files

Merge branch 'dev' into 'master'

Dev

See merge request !169
parents 4630ba06 29cbb956
No related branches found
No related tags found
1 merge request!169Dev
......@@ -757,7 +757,7 @@ ul li {
margin-left: 15px;
padding: 9px 0 0 10px;
position: absolute;
top: 315px;
top: 410px;
width: 95px;
height: 40px;
text-transform: uppercase;
......@@ -780,7 +780,7 @@ ul li {
#enTeteEvenement,
#enTeteArticle,
#enTeteTrombinoscope {
height: 350px;
height: 440px;
margin-bottom: 0px;
padding-top: 20px;
width: 100%;
......@@ -805,7 +805,7 @@ ul li {
padding: 0px 174px 0px 5px;
font-size: 43px;
text-transform: uppercase;
margin: 60px 0 0% 3%;
margin:120px 0 0% 3%;
font-weight: initial;
}
......@@ -1131,7 +1131,7 @@ div.evenement img {
/* Qui sommes-nous ? */
#enTeteQuiSommesNous {
height: 360px;
height: 440px;
margin-top: 50px;
background: black;
}
......
......@@ -61,7 +61,7 @@
[(#REM) Liste des documents]
<div id="listeResultatsRechercheDocuments">
<BOUCLE_documents_image(DOCUMENTS){extension==jpg|png|gif}{id_article}{doublons}>
<!--
<a href="#URL_DOCUMENT" target="_blank">
<div class="resultatDocument"
style="background-image: url('[(#FICHIER|extraire_attribut{src}|url_absolue))]');"
......@@ -74,6 +74,7 @@
</div>
</div>
</a>
-->
</BOUCLE_documents_image>
<BOUCLE_documents(DOCUMENTS){mode=document}{id_article}{doublons}>
<a href="#URL_DOCUMENT" target="_blank">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment