update main branch #47

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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -322,7 +322,7 @@ $button-border: 2px solid $button-color;//1px solid transparent;
$button-hollow-border-width: 2px;
$button-sizes: (
tiny: 0.7rem,
small: 0.95rem,
small: 0.9rem,
default: 1.6rem,
large: 2.4rem,
);

View File

@ -4,8 +4,6 @@
.accordion-title {
ul,ol {
list-style: none;
//@include flex;
//@include flex-align(justify,middle);
@include xy-grid;
}
li {

View File

@ -43,8 +43,10 @@ main {
}
section {
padding: $global-padding $global-padding*2;
//margin: $global-margin;
}
.omekas-entry-content {
@include xy-cell(12);
}
.entry-content {
@include breakpoint(small){
@include xy-cell(12);
@ -152,12 +154,11 @@ main {
.collections-list {
@include xy-grid;
width:100vw;
padding:0;
header,main{
@include xy-cell(12);
@include flex;
@include flex-align(center,top);
padding: $global-padding*2 0;
}
header {
margin-top: 2*$global-margin;
@ -166,10 +167,15 @@ main {
}
main {
@include xy-grid;
article{
padding: 0;
margin: 0;
article {
@include card-container();
@include breakpoint(small){
@include xy-cell();
width: 100%;
padding: 0;
margin: 0;
@include breakpoint(small){
font-size: $global-font-size*0.7;
}
@include breakpoint(medium){
@ -179,18 +185,19 @@ main {
}
margin-bottom:0;
}
table {
thead,tbody,tfoot {
margin: $global-padding*2;
}
}
}
.accordion-content {
padding-top: 0;
section {
@include xy-grid;
padding-top: 0;
padding-bottom: 0;
@include breakpoint(small){
figure {
@include xy-cell(12);
background-color: $light-gray;
margin-left:0;
margin-right:0;
}
p {
@include xy-cell(12);
@ -199,6 +206,7 @@ main {
@include breakpoint(medium){
figure {
@include xy-cell(3);
margin-left: 0;
}
p {
@include xy-cell(9);
@ -382,5 +390,4 @@ main {
width: 100%;
}
//end omeka specific styles