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
This commit is contained in:
Jeremy Benoist
2019-04-01 13:16:15 +02:00
parent b886ee923d bfd69c74e5
commit 3620dae1e6
14 changed files with 185 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,6 +102,11 @@ main {
display: inline-flex;
vertical-align: middle;
.card-reading-time,
.card-created-at {
display: inline-flex;
}
span {
margin-right: 5px;
}
@ -283,9 +288,3 @@ a.original:not(.waves-effect) {
.settings .div_tabs {
padding-bottom: 15px;
}
@media only screen and (min-width: 992px) {
.card-tag-labels li {
max-width: 50%;
}
}

19
app/Resources/static/themes/material/css/media_queries.scss
View File

@ -12,6 +12,16 @@
.pagination {
margin-left: auto;
}
.card-tag-labels li {
max-width: 50%;
}
}
@media screen and (min-width: 993px) {
body.entry main #content {
padding-left: 70px;
}
}
@media only screen and (max-width: 992px) {
@ -164,3 +174,12 @@
padding: 0;
}
}
@media screen and (max-width: 310px),
screen and (min-width: 601px) and (max-width: 660px),
screen and (min-width: 993px) and (max-width: 1050px),
screen and (min-width: 1201px) and (max-width: 1250px) {
.card .card-action .reading-time .card-created-at {
display: none;
}
}