merge master in prod

This commit is contained in:
2020-09-08 12:00:45 +02:00
parent b925edaa9e
commit 3e5e731c2c
226 changed files with 8516 additions and 4149 deletions
@@ -3,7 +3,7 @@ $fonts-default: 'Roboto' !default;
$fonts-mono: 'Inconsolata' !default;
$font-definitions: (
Josefin+Slab: 400,
'Josefin Slab': '400',
Roboto: '300,400,500',
Inconsolata: '400,700'
);
@@ -244,7 +244,7 @@ $content-padding: 1.5rem;
display: flex;
align-items: center;
a:not(.front-end) {
display: inherit;
}
@@ -798,6 +798,7 @@ body.sidebar-quickopen #admin-main {
.button {
margin: 0;
height: 37px;
&.dropdown-toggle {
margin-left: -4px;
@@ -103,6 +103,7 @@
justify-content: center;
&.text-logo {
text-align: center;
font-size: 4rem;
}
@@ -24,7 +24,10 @@
font-size: 90%;
}
&:disabled {
opacity: .6;
cursor: no-drop;
}
}