diff --git a/paquet.xml b/paquet.xml index 8f4ef15..ff445ec 100644 --- a/paquet.xml +++ b/paquet.xml @@ -1,7 +1,7 @@ ul > li > a $('.page_wrapper').append(''); $('.menu-items__lien.sousinitiatives').on('click', function(){ - $('.menucache').addClass('cache'); + $('.menucache').toggleClass('cache'); $(this).toggleClass('actif'); $(this).siblings('ul').toggleClass('ouvert'); $(this).parent().siblings('.sousinitiatives').find('ul.ouvert').removeClass('ouvert'); diff --git a/squelettes/scss/base/_spip.scss b/squelettes/scss/base/_spip.scss index 3a6b316..131852f 100644 --- a/squelettes/scss/base/_spip.scss +++ b/squelettes/scss/base/_spip.scss @@ -31,7 +31,8 @@ display: none !important; } -ul.spip { +ul.spip, ol.spip { + margin-left: 1rem; li { margin:0 0 0.5em; } diff --git a/squelettes/scss/components/_pagination.scss b/squelettes/scss/components/_pagination.scss index ed1a60d..5fbd3f3 100644 --- a/squelettes/scss/components/_pagination.scss +++ b/squelettes/scss/components/_pagination.scss @@ -63,3 +63,38 @@ .col .next { display: none; } + +/* spip4 */ +.pagination, .aside .nav .pagination { + margin: 2em 0; + .pagination-items { + display:flex; + justify-content:center; + flex-wrap:wrap; + list-style:none; + } + .pagination-item { + padding:0; + background:none; + margin:0 0.15em 0.5em; + } + .pagination-items a, .pagination-items span.on { + display:inline-block; + text-decoration:none; + border:none; + padding:0.5em; + @include vendor-prefix(border-radius,0.25em); + font-size:1em; + font-weight:700; + line-height:1.5; + color:$couleur-lien; + } + .pagination-items a:hover, .pagination-items span.on { + background:$grayLighter !important; + color:$couleur-lien-hover; + text-decoration:none; + } + .tbc { + line-height: 2.4; + } +} diff --git a/squelettes/scss/styles/_modeles.scss b/squelettes/scss/styles/_modeles.scss index 5288d00..ad64b13 100644 --- a/squelettes/scss/styles/_modeles.scss +++ b/squelettes/scss/styles/_modeles.scss @@ -20,3 +20,30 @@ a { font-size:140%; } } + + +// +// modele bouton +// +.btn { + @include bouton(); + &.right { + float:right; + margin-left:$spacer; + } + &.left { + float:left; + margin-right:$spacer; + } + &.center { + display: block; + clear:both; + width: 300px; + margin:0 auto; + padding:1.5rem; + } + &.bold { + border-width:2px; + font-weight:700; + } +} diff --git a/squelettes/scss/styles/_nav.scss b/squelettes/scss/styles/_nav.scss index 46400e4..1baf072 100644 --- a/squelettes/scss/styles/_nav.scss +++ b/squelettes/scss/styles/_nav.scss @@ -71,7 +71,7 @@ // ---------------------------------------- .btn-nav { position:absolute; - z-index:2; + z-index:10; right:$spacer; top:0; padding:0.4rem; @@ -109,6 +109,7 @@ left:-100%; padding:$spacer/2 $spacer; text-align:center; + z-index:10; &.ouvert{ left:0; } diff --git a/squelettes/scss/styles/_styles.scss b/squelettes/scss/styles/_styles.scss index d5078e3..beee90b 100644 --- a/squelettes/scss/styles/_styles.scss +++ b/squelettes/scss/styles/_styles.scss @@ -1,18 +1,5 @@ -// -// modele bouton -// -.btn { - @include bouton(); - &.right { - float:right; - margin-left:$spacer; - } - &.left { - float:left; - margin-right:$spacer; - } -} + // pour usage du btn, mais utile ailleurs eventuellement .taille70 { font-size:70%; @@ -160,8 +147,17 @@ a.back-to-top { flex-wrap:wrap; justify-content:space-between; } +.flex2 > * { + width:100%; + @include media($bp-small-up) { + max-width:calc(50% - 1rem); + } +} .flex3 > * { - max-width:30%; + width:100%; + @include media($bp-small-up) { + max-width:calc(33.33% - 1rem); + } } diff --git a/squelettes/scss/utils/_mixins.scss b/squelettes/scss/utils/_mixins.scss index cc2843a..4614e2d 100644 --- a/squelettes/scss/utils/_mixins.scss +++ b/squelettes/scss/utils/_mixins.scss @@ -116,7 +116,7 @@ background:$sombre; color:$clair !important; font-weight:700; - padding: ($spacer/2) $spacer; + padding: ($spacer/2.5) ($spacer/1.5); &:hover { background-color: $survol;