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

File diff suppressed because one or more lines are too long

View File

@ -1,3 +1,6 @@
button {
@extend .button;
}
button,.button { button,.button {
&.small{ &.small{
padding: $global-padding*0.5 $global-padding*1.5; padding: $global-padding*0.5 $global-padding*1.5;
@ -58,3 +61,6 @@ button,.button {
border: none; border: none;
} }
} }
.end_of_page_button {
@extend .button.small;
}