mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-17 03:05:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5676 from Simounet/fix/style-row-card-regression

Browse source
This commit is contained in:
Jérémy Benoist 2022-03-15 15:39:21 +01:00 committed by GitHub
commit 4b32192178
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/Resources/static/themes/material/css/cards.scss
View file

@ -6,11 +6,6 @@ main {
#content { #content {
padding: 0 0.5rem; padding: 0 0.5rem;
} }
.row {
margin: 0.4rem 0 0;
padding: 0 0.75rem;
}
} }
@mixin mixin-reading-time { @mixin mixin-reading-time {
@ -32,11 +27,6 @@ main {
} }
.card { .card {
display: flex;
margin: 0;
height: 100%;
flex-direction: column;
.card-content { .card-content {
padding-bottom: 12px; padding-bottom: 12px;
flex-grow: 1; flex-grow: 1;
@ -324,11 +314,21 @@ a.original:not(.waves-effect) {
padding-bottom: 15px; padding-bottom: 15px;
} }
.row { .entries-row {
display: grid; display: grid;
margin: 0.4rem 0 0;
padding: 0 0.75rem;
gap: 20px; gap: 20px;
} }
.entry-card {
display: flex;
margin: 0;
height: 100%;
flex-direction: column;
}
.tools { .tools {
display: flex; display: flex;
gap: 10px; gap: 10px;

2
app/Resources/static/themes/material/css/media_queries.scss
View file

@ -3,7 +3,7 @@
========================================================================== */ ========================================================================== */
@media only screen and (min-width: 450px) { @media only screen and (min-width: 450px) {
.row { .entries-row {
grid-template-columns: repeat(auto-fill, minmax(340px, 1fr)); grid-template-columns: repeat(auto-fill, minmax(340px, 1fr));
} }
} }

2
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig
View file

@ -1,4 +1,4 @@
<div class="card{% if currentRoute in routes and entry.isArchived %} archived{% endif %}"> <div class="card entry-card{% if currentRoute in routes and entry.isArchived %} archived{% endif %}">
<div class="card-body"> <div class="card-body">
<div class="card-fullimage"> <div class="card-fullimage">
<ul class="card-entry-labels"> <ul class="card-entry-labels">

2
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig
View file

@ -1,4 +1,4 @@
<div class="card{% if currentRoute in routes and entry.isArchived %} archived{% endif %}"> <div class="card entry-card{% if currentRoute in routes and entry.isArchived %} archived{% endif %}">
<div class="card-body"> <div class="card-body">
<div class="card-image waves-effect waves-block waves-light"> <div class="card-image waves-effect waves-block waves-light">
<ul class="card-entry-labels"> <ul class="card-entry-labels">

2
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
View file

@ -55,7 +55,7 @@
</div> </div>
{% endif %} {% endif %}
<ol class="entries {% if listMode == 1 %}collection{% else %}row data{% endif %}"> <ol class="entries {% if listMode == 1 %}collection{% else %}row entries-row data{% endif %}">
{% for entry in entries %} {% for entry in entries %}
<li id="entry-{{ entry.id|e }}" class="{% if listMode != 0 %}col collection-item{% endif %} s12" data-entry-id="{{ entry.id|e }}" data-test="entry"> <li id="entry-{{ entry.id|e }}" class="{% if listMode != 0 %}col collection-item{% endif %} s12" data-entry-id="{{ entry.id|e }}" data-test="entry">

2
web/wallassets/material.css
View file

File diff suppressed because one or more lines are too long

2
web/wallassets/material.css.map
View file

File diff suppressed because one or more lines are too long