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.5.0

Browse Source
This commit is contained in:
Jeremy Benoist
2022-05-13 13:50:50 +02:00
parent 49d5f27cd0 e1957c08e4
commit 4947ea6758
106 changed files with 2100 additions and 1461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,16 +6,6 @@ main {
#content {
padding: 0 0.5rem;
}
ul.row {
margin: 0.4rem 0 0;
padding: 0 0.75rem;
}
}
.data .card .card-body {
height: 19em;
overflow: hidden;
}
@mixin mixin-reading-time {
@ -37,6 +27,11 @@ main {
}
.card {
.card-content {
padding-bottom: 12px;
flex-grow: 1;
}
.card-content .card-title,
.card-reveal .card-title {
line-height: 22.8px;
@ -95,7 +90,7 @@ main {
}
.card-action {
padding: 10px 5px 10px 15px;
padding: 10px 10px 10px 15px;
ul.links {
margin: 0;
@ -112,8 +107,9 @@ main {
color: #fff;
}
ul.tools li a.tool {
margin-right: 5px !important;
.tool {
display: flex;
margin-right: 0 !important;
}
@include mixin-reading-time;
@ -134,6 +130,12 @@ main {
}
}
.card-body {
display: flex;
flex-grow: 1;
flex-direction: column;
}
a.original:not(.waves-effect) {
text-overflow: ellipsis;
white-space: nowrap;
@ -311,3 +313,23 @@ a.original:not(.waves-effect) {
.settings .div_tabs {
padding-bottom: 15px;
}
.entries-row {
display: grid;
margin: 0.4rem 0 0;
padding: 0 0.75rem;
gap: 20px;
}
.entry-card {
display: flex;
margin: 0;
height: 100%;
flex-direction: column;
}
.tools {
display: flex;
gap: 10px;
}