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 75 additions and 64 deletions
Showing only changes of commit 1e52ccf4e4 - Show all commits

View File

@ -1,3 +1,4 @@
.hero{
.search{
.input-group * {
margin: 0;
@ -37,8 +38,7 @@
right: 2rem;
+ .appear {
display: block;
color: $primary-color;
background-color: $input-background-focus;
background-color: scale-color($input-background-focus, $lightness: -20%);
z-index: 2;
&:hover {
color: $white;
@ -64,3 +64,4 @@
}
}
}
}

View File

@ -554,8 +554,18 @@ body.vertical-menu header .desktop {
margin-bottom: 0;
}
.sorting button {
// margin-bottom: 0;
.sorting {
display: flex;
button,.button {
padding: 0 $global-padding*1.4;
font-size: $global-font-size * 0.85;
margin: 0 $global-margin;
}
select {
// width: 100%;
// height: 100%;
margin-bottom: 0;
}
}
.layout-toggle button {