Merge pull request #6991 from Simounet/feat/6971-mass-action-click-full-card

Fix #6971 - Full clickable card on mass action
This commit is contained in:
Nicolas Lœuillet 2023-09-29 14:53:27 +02:00 committed by GitHub
commit e4d69cafe4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 14 deletions

View file

@ -38,25 +38,29 @@
border-radius: 2px 0 0 2px; border-radius: 2px 0 0 2px;
} }
.entry-checkbox { .card-stacked .entry-checkbox {
margin: 10px 15px 10px 5px; margin: 10px 15px 10px 5px;
}
.card & { .card .entry-checkbox {
float: right; position: absolute;
margin-right: 0; display: flex;
padding: 10px; padding: 10px;
} inset: 0;
justify-content: flex-end;
align-items: start;
background-color: rgb(0 172 193 / 20%);
cursor: pointer;
z-index: 10;
} }
.entries .entry-checkbox-input, .entries .entry-checkbox-input,
.mass-action .entry-checkbox-input { .mass-action .entry-checkbox-input {
position: relative; position: relative;
left: 0;
width: 20px; width: 20px;
min-height: 25px; min-height: 25px;
height: 100%;
vertical-align: middle;
opacity: initial; opacity: initial;
cursor: pointer;
z-index: 10; z-index: 10;
} }

View file

@ -1,3 +1,3 @@
<div class="entry-checkbox"> <label class="entry-checkbox">
<input type="checkbox" class="entry-checkbox-input" data-js="entry-checkbox" name="entry-checkbox[]" value="{{ entry.id }}" /> <input type="checkbox" class="entry-checkbox-input" data-js="entry-checkbox" name="entry-checkbox[]" value="{{ entry.id }}" />
</div> </label>

View file

@ -1,7 +1,7 @@
<div class="card entry-card{% if currentRoute in routes and entry.isArchived %} archived{% endif %}"> <div class="card entry-card{% if currentRoute in routes and entry.isArchived %} archived{% endif %}">
{% include "@WallabagCore/Entry/Card/_mass_checkbox.html.twig" with {'entry': entry} only %}
<div class="card-body"> <div class="card-body">
<div class="{% if app.user.config.displayThumbnails %}card-image{% endif %} waves-effect waves-block waves-light"> <div class="{% if app.user.config.displayThumbnails %}card-image{% endif %} waves-effect waves-block waves-light">
{% include "@WallabagCore/Entry/Card/_mass_checkbox.html.twig" with {'entry': entry} only %}
<ul class="card-entry-labels"> <ul class="card-entry-labels">
{% for tag in entry.tags|slice(0, 3) %} {% for tag in entry.tags|slice(0, 3) %}
<li title="{{ tag.label }}"><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> <li title="{{ tag.label }}"><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long