pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

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

Browse Source 
# Conflicts:
#	web/wallassets/baggy.js
#	web/wallassets/manifest.json
#	web/wallassets/material.css
#	web/wallassets/material.js
This commit is contained in:
Jeremy Benoist
2018-11-25 09:58:18 +01:00
parent e673b54f70 bffe65478d
commit b878be4cc9
40 changed files with 802 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Resources/static/themes/material/css/cards.scss
View File

@ -118,9 +118,14 @@ main {
.card-image .preview,
.card-fullimage .preview {
height: 14em;
height: 100%;
background: no-repeat 50%/cover;
background-color: #efefef;
display: block;
&--default {
background-size: contain;
}
}
&.sw {