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{ &.eu{
&::before { &::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'); background-image: url('../img/eu_flag_creative_europe_co_funded_left.svg');
} }
} }

View File

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

View File

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

View File

@ -31,9 +31,19 @@ footer {
} }
&.eu { &.eu {
&::before { &::before {
margin-top:unset; @include breakpoint(small) {
max-width:100%; // background-image: url('../img/eu_flag_creative_europe_co_funded_black_right.svg');
max-height: 4rem; 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;
}
} }
} }
} }
@ -76,4 +86,3 @@ footer {
} }
} }
} }

View File

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

View File

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