Merge remote-tracking branch 'origin/master' into 2.4

This commit is contained in:
Jeremy Benoist
2019-01-15 09:41:18 +01:00
61 changed files with 3813 additions and 1509 deletions

View File

@ -116,18 +116,6 @@ main {
height: 13.5em;
}
.card-image .preview,
.card-fullimage .preview {
height: 100%;
background: no-repeat 50%/cover;
background-color: #efefef;
display: block;
&--default {
background-size: contain;
}
}
&.sw {
max-width: 370px;
margin-left: auto;
@ -142,6 +130,19 @@ a.original:not(.waves-effect) {
display: block;
}
.card .card-image .preview,
.card .card-fullimage .preview,
.card-stacked .preview {
height: 100%;
background: no-repeat 50%/cover;
background-color: #efefef;
display: block;
&--default {
background-size: contain;
}
}
.card-entry-labels li,
.card-tag-labels li {
margin: 10px 10px 10px auto;
@ -221,24 +222,21 @@ a.original:not(.waves-effect) {
text-align: right;
}
.preview {
.card-preview {
max-width: 100px;
height: auto;
max-height: 50px;
margin-right: 10px;
flex: 1;
img {
max-width: 100%;
max-height: 100%;
}
}
div.metadata {
.chip {
background-color: $blueAccentColor;
padding: 0 15px 0 10px;
padding: 0 7px;
margin: auto 2px;
border-radius: 6px;
line-height: 22px;
height: 22px;
a,
i {