update main branch #47

Merged
jorge merged 166 commits from develop into main 2021-12-01 11:20:13 +01:00
7 changed files with 129 additions and 99 deletions
Showing only changes of commit d77d28e674 - Show all commits

File diff suppressed because one or more lines are too long

View File

@ -24,8 +24,6 @@
}
&.eu{
&::before {
max-width: 15rem;
// background-image: url('../img/eu_flag_creative_europe_co_funded_black_right.svg');
background-image: url('../img/eu_flag_creative_europe_co_funded_left.svg');
}
}

View File

@ -293,7 +293,7 @@ footer {
padding: (2 * $global-padding) 0;
@include breakpoint(small down) {
margin: 0 $global-margin;
// margin: 0 $global-margin;
}
}

View File

@ -148,6 +148,7 @@ main {
.collections-list {
@include xy-grid;
width:100vw;
header,main{
@include xy-cell(12);
@include flex;
@ -162,12 +163,13 @@ main {
main {
@include xy-grid;
article{
// text-align:center;
@include card-container();
@include breakpoint(small){
@include xy-cell();
font-size: $global-font-size*0.7;
}
@include breakpoint(medium){
font-size: $global-font-size*1;
}
@include breakpoint(large){
}
@ -180,12 +182,26 @@ main {
}
}
.accordion-content {
@include xy-grid(12);
section {
@include xy-grid;
@include breakpoint(small){
figure {
@include xy-cell(4);
@include xy-cell(12);
}
p {
@include xy-cell(6);
@include xy-cell(12);
}
}
@include breakpoint(medium){
figure {
@include xy-cell(3);
}
p {
@include xy-cell(9);
}
}
@include breakpoint(large){
}
}
}
}
@ -234,11 +250,12 @@ main {
@include xy-grid();
.slide {
@include xy-grid;
justify-content: center;
@include breakpoint(small){
width: 100vw;
margin: 0;
.textwidget {
padding: $global-padding * 3;
.textwidget {
}
}
@include breakpoint(medium){
@ -331,7 +348,6 @@ main {
align-content: center;
align-self: center;
margin: $global-margin auto;
justify-content: center;
&:first-child {
color: unset;
background-color: unset;

View File

@ -31,10 +31,20 @@ footer {
}
&.eu {
&::before {
@include breakpoint(small) {
// background-image: url('../img/eu_flag_creative_europe_co_funded_black_right.svg');
background-position-x: right;
max-width: 50vw;
margin-top:unset;
}
@include breakpoint(medium) {
background-position-x: left;
margin-top:unset;
max-width:100%;
max-height: 4rem;
}
}
}
}
.copyright, .legal-credits {
@ -76,4 +86,3 @@ footer {
}
}
}

View File

@ -10,7 +10,7 @@
min-width: 14rem;
text-align: center;
}
@include breakpoint(medium){
@include breakpoint(large){
@include xy-cell(shrink);
@include flex-align(left, middle);
text-align: unset;
@ -32,15 +32,22 @@
padding: 0;
font-size: 0.8rem;
}
.menu a {
padding: $global-padding*0.7 $global-padding*0.5;
}
}
@include breakpoint(medium) {
menu {
font-size: $global-font-size*1.5;
}
}
@include breakpoint(large) {
@include xy-cell(auto);
@include flex;
@include flex-align(right, middle);
menu {
margin: inherit;
padding: inherit;
font-size: $global-font-size*1.5;
}
}
}

View File

@ -27,7 +27,7 @@ $summary = $showSummary ? $site->summary() : null;
</li>
</ul>
</a>
<div class="accordion-content" data-tab-content>
<aside class="accordion-content" data-tab-content>
<figure>
<?php if ($site_meta_values != null): ?>
<img src="<?= $site_meta_values['thumbnail']; ?>" />
@ -39,5 +39,5 @@ $summary = $showSummary ? $site->summary() : null;
<?php endif; ?>
<a class="button small" href="<?= $site->siteUrl() ?>">View</a>
</p>
</div>
</aside>
</li>