From d0cfdaf10e30796e30d4e3439178f14f84fee953 Mon Sep 17 00:00:00 2001 From: Simounet Date: Tue, 15 Mar 2022 13:54:04 +0100 Subject: [PATCH] Fix row and card style regressions --- .../static/themes/material/css/cards.scss | 22 +++++++++---------- .../themes/material/css/media_queries.scss | 2 +- .../material/Entry/_card_full_image.html.twig | 2 +- .../material/Entry/_card_preview.html.twig | 2 +- .../themes/material/Entry/entries.html.twig | 2 +- web/wallassets/material.css | 2 +- web/wallassets/material.css.map | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index 93020eab7..fe5ae2aaf 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss @@ -6,11 +6,6 @@ main { #content { padding: 0 0.5rem; } - - .row { - margin: 0.4rem 0 0; - padding: 0 0.75rem; - } } @mixin mixin-reading-time { @@ -32,11 +27,6 @@ main { } .card { - display: flex; - margin: 0; - height: 100%; - flex-direction: column; - .card-content { padding-bottom: 12px; flex-grow: 1; @@ -324,11 +314,21 @@ a.original:not(.waves-effect) { padding-bottom: 15px; } -.row { +.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; diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss index f2e9ea68b..c11fd5c42 100644 --- a/app/Resources/static/themes/material/css/media_queries.scss +++ b/app/Resources/static/themes/material/css/media_queries.scss @@ -3,7 +3,7 @@ ========================================================================== */ @media only screen and (min-width: 450px) { - .row { + .entries-row { grid-template-columns: repeat(auto-fill, minmax(340px, 1fr)); } } diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig index 12e89bf2a..a1914486e 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig @@ -1,4 +1,4 @@ -
+