update main branch #47

Merged
jorge merged 166 commits from develop into main 2021-12-01 11:20:13 +01:00
2 changed files with 21 additions and 14 deletions
Showing only changes of commit 852f119de0 - Show all commits

File diff suppressed because one or more lines are too long

View File

@ -100,7 +100,7 @@ main {
max-width: 50rem;
}
@include breakpoint(xlarge){
max-width: 50rem;
// max-width: 50rem;
}
}
}
@ -207,12 +207,12 @@ main {
padding: 0;
margin: 0;
article {
@include breakpoint(small){
@include card-container();
@include xy-cell();
width: 100%;
padding: 0;
margin: 0;
@include breakpoint(small){
font-size: $global-font-size*0.7;
}
@include breakpoint(medium){
@ -220,7 +220,6 @@ main {
}
@include breakpoint(large){
}
margin-bottom:0;
}
}
.accordion-content {
@ -306,13 +305,13 @@ main {
@include xy-grid();
.slide {
@include xy-grid;
justify-content: center;
overflow: hidden;
padding: 0;
@include breakpoint(small){
width: 100vw;
overflow: hidden;
padding: 0;
margin: 0;
// padding: $global-padding * 3;
justify-content: center;
color: $white;
.textwidget {
}
}
@ -327,8 +326,8 @@ main {
@include breakpoint(large){
width: 50%;
height: calc((50vw*9)/16);
padding: 0;
margin: 0;
//padding: 0;
//margin: 0;
//overflow:hidden;
a {
@include flex;
@ -359,7 +358,6 @@ main {
background-color: $primary-color;
font-variant:all-small-caps;
}
color: $white;
.logo {
@include breakpoint(medium){
@ -375,8 +373,17 @@ main {
@include xy-cell(auto);
@include flex;
@include flex-align(spaced,middle);
min-height: 6rem;
@include breakpoint(small) {
flex-direction: column;
min-height: unset;
padding: $global-padding;
//min-height: unset;
}
@include breakpoint(large) {
flex-direction: row;
min-height: $global-padding * 6;
padding: $global-padding 0 ;
}
a {
color: $body-font-color;
}