Commit b25bda26 authored by Pierre's avatar Pierre
Browse files

Merge branch 'master' of gitlab.domainepublic.net:domainepublic/dpsite2

parents b3cdce94 69dc7ac4
......@@ -9,10 +9,11 @@
<div class="ajax">
<INCLURE{fond=inclure/infotech,env,ajax}>
</div>
[(#REM)
<div class="ajax">
<INCLURE{fond=aside/articles-recents,env,ajax}>
</div>
[(#REM)
]
]
......
......@@ -44,9 +44,9 @@
</BOUCLE_offre>
</article>
</B_offre>
<BOUCLE_0_article(ARTICLES) {id_secteur!==#RACINE_SPECIALISEE}{0,1}>
<div id="derniersarticleshome">
<h2>Derniers articles</h2>
<BOUCLE_0_article(ARTICLES) {id_secteur!==#RACINE_SPECIALISEE}{0,3}>
[(#REM) <!-- Rubriques de niveau zero (secteurs) --> ]
[(#CONFIG{sarkaspip/sommaire/position_secteurs, 0}|=={1}|oui)
<INCLURE{fond=noisettes/sommaire/liste-secteurs}{lang}>
......@@ -54,10 +54,9 @@
]
[(#REM) <!-- Derniers articles publies --> ]
[(#CONFIG{sarkaspip/sommaire/position_articles_recents, 1}|=={1}|oui)
<INCLURE{fond=noisettes/sommaire/liste-articles_recents}{doublons}{lang}>
#SET{page_vide, 0}
]
</BOUCLE_0_article>
<BOUCLE_0_album(ALBUMS?) {0,1} {si #CONFIG{sarkaspip/sommaire/position_albums_recents, 1}|=={1}}{si #PLUGIN{albums}}>
......@@ -66,7 +65,7 @@
#SET{page_vide, 0}
</BOUCLE_0_album>
</div> <!-- FIN derniersarticleshome -->
</div>
[(#GET{page_vide}|oui)
......
......@@ -8,7 +8,7 @@
]
<B_articlerec>
<div class="liste long articles articles_recents">
<h2>Dernier article</h2>
<ul class="liste-items">
<BOUCLE_articlerec(ARTICLES){id_secteur!==#RACINE_SPECIALISEE}{id_rubrique!=51}{doublons}{par date}{inverse}{0,#CONFIG{sarkaspip/sommaire/max_articles_recents, 5}}>
<li class="item"><INCLURE{fond=inclure/resume/article,id_article,
......
......@@ -248,6 +248,7 @@ background: none repeat scroll 0 0 #F8F8F8;
}
.navbar .nav > li > a {
text-shadow: none;
font-variant: small-caps;
}
.navbar .nav > .active > a, .navbar .nav > .active > a:hover, .navbar .nav > .active > a:focus {
background-color: rgba(0, 0, 0, 0.05);
......@@ -392,6 +393,8 @@ table {
/* FRED */
h1, h2, h3 {font-variant: small-caps;}
#navred {position: fixed;}
#navred, .navbar-inverse .navbar-inner {background-image: none;background-color: black; border: none}
......@@ -399,13 +402,18 @@ table {
.nav-aside ul.menu-liste li {margin-bottom: 10px}
.nav-aside ul.menu-liste li a { background-color: rgba(143, 0, 0, 0.8);
.nav-aside ul.menu-liste li a {
border-radius: 10px;
color: white;
font-size: 20px;
padding: 10px;
text-align: center; text-shadow:none;}
.nav-aside ul.menu-liste li:first-child a{background-color: rgba(143, 0, 0, 0.8);}
.nav-aside ul.menu-liste li:nth-child(2) a{background-color: rgba(102, 160, 165, 0.8);}
.nav-aside ul.menu-liste li:nth-child(3) a{background-color: rgba(106, 160, 67, 0.8);}
.nav-aside ul.menu-liste li a:hover {background-color: rgba(143, 0, 0, 0.5);}
.nav-aside ul.menu-liste li:nth-child(2) a:hover{background-color: rgba(102, 160, 165, 0.5);}
.nav-aside ul.menu-liste li:nth-child(3) a:hover{background-color: rgba(106, 160, 67, 0.5);}
.nav-aside ul.menu-liste li a:before {content: '→ '}
......@@ -425,4 +433,10 @@ background: #f8f8f8 none repeat scroll 0 0;
.page_sommaire #content section article#une h1 {font-variant: small-caps;}
#documents_joints_offre ul {display: flex}
#documents_joints_offre ul li{padding: 0px; margin-right: 10px}
\ No newline at end of file
#documents_joints_offre ul li{padding: 0px; margin-right: 10px}
#derniersarticleshome > h2 {text-align: center;}
#derniersarticleshome .liste:first-child ul.liste-items,
#derniersarticleshome .liste:first-child ul.liste-items li.item,
#derniersarticleshome .liste:first-child ul.liste-items li.item article{padding-top: 0px; margin-top: 0px}
.liste.long.articles.articles_recents {margin-bottom: 0px}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment