oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-06 17:41:01 +00:00
Code Wiki Activity

Merge pull request #8013 from yguedidi/upgrade-materialize

Browse source 
Upgrade Materialize
This commit is contained in:
Yassine Guedidi 2025-02-20 00:23:44 +01:00 • committed by GitHub
commit 5473a215ce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 183 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/dependabot.yml vendored
View file

@ -15,9 +15,9 @@ updates:
patterns: patterns:
- "*fontsource*" - "*fontsource*"
ignore: ignore:
- dependency-name: materialize-css - dependency-name: @materializecss/materialize
versions: versions:
- "> 0.98.2" - "> 1.2.2"
- package-ecosystem: composer - package-ecosystem: composer
directory: "/" directory: "/"
schedule: schedule:

31
assets/index.js
View file

@ -1,8 +1,8 @@
import $ from 'jquery'; import $ from 'jquery';
/* Materialize imports */ /* Materialize imports */
import 'materialize-css/dist/css/materialize.css'; import '@materializecss/materialize/dist/css/materialize.css';
import 'materialize-css/dist/js/materialize'; import '@materializecss/materialize/dist/js/materialize';
/* Annotations */ /* Annotations */
import annotator from 'annotator'; import annotator from 'annotator';
@ -272,22 +272,23 @@ const articleScroll = () => {
}; };
$(document).ready(() => { $(document).ready(() => {
// sideNav // sidenav
$('.button-collapse').sideNav(); $('.sidenav').sidenav();
$('select').material_select(); $('select').formSelect();
$('.collapsible').collapsible({ $('.collapsible[data-collapsible="accordion"]').collapsible();
$('.collapsible[data-collapsible="expandable"]').collapsible({
accordion: false, accordion: false,
}); });
$('.datepicker').pickadate({
selectMonths: true,
selectYears: 15,
formatSubmit: 'yyyy-mm-dd',
hiddenName: false,
format: 'yyyy-mm-dd',
container: 'body',
});
$('.dropdown-trigger').dropdown({ hover: false }); $('.dropdown-trigger').dropdown({ hover: false });
$('.dropdown-trigger[data-covertrigger="false"][data-constrainwidth="false"]').dropdown({
hover: false,
coverTrigger: false,
constrainWidth: false,
});
$('.tabs').tabs();
$('.tooltipped').tooltip();
initFilters(); initFilters();
initExport(); initExport();
@ -306,7 +307,7 @@ $(document).ready(() => {
$('.nav-panel-add-tag').toggle(100); $('.nav-panel-add-tag').toggle(100);
$('.nav-panel-menu').addClass('hidden'); $('.nav-panel-menu').addClass('hidden');
if (window.innerWidth < mobileMaxWidth) { if (window.innerWidth < mobileMaxWidth) {
$('.side-nav').sideNav('hide'); $('.sidenav').sidenav('close');
} }
$('#tag_label').focus(); $('#tag_label').focus();
return false; return false;

8
assets/js/shortcuts/entry.js
View file

@ -5,22 +5,22 @@ $(document).ready(() => {
if ($('#article').length > 0) { if ($('#article').length > 0) {
/* open original article */ /* open original article */
Mousetrap.bind('o', () => { Mousetrap.bind('o', () => {
$('ul.side-nav a.original i')[0].click(); $('ul.sidenav a.original i')[0].click();
}); });
/* mark as favorite */ /* mark as favorite */
Mousetrap.bind('f', () => { Mousetrap.bind('f', () => {
$('ul.side-nav a.favorite i')[0].click(); $('ul.sidenav a.favorite i')[0].click();
}); });
/* mark as read */ /* mark as read */
Mousetrap.bind('a', () => { Mousetrap.bind('a', () => {
$('ul.side-nav a.markasread i')[0].click(); $('ul.sidenav a.markasread i')[0].click();
}); });
/* delete */ /* delete */
Mousetrap.bind('del', () => { Mousetrap.bind('del', () => {
$('ul.side-nav a.delete i')[0].click(); $('ul.sidenav a.delete i')[0].click();
}); });
} }
}); });

4
assets/js/tools.js
View file

@ -32,7 +32,7 @@ function initFilters() {
// no display if filters not available // no display if filters not available
if ($('div').is('#filters')) { if ($('div').is('#filters')) {
$('#button_filters').show(); $('#button_filters').show();
$('.js-filters-action').sideNav({ edge: 'right' }); $('#filters.sidenav').sidenav({ edge: 'right' });
$('#clear_form_filters').on('click', () => { $('#clear_form_filters').on('click', () => {
$('#filters input').val(''); $('#filters input').val('');
$('#filters :checked').removeAttr('checked'); $('#filters :checked').removeAttr('checked');
@ -46,7 +46,7 @@ function initExport() {
// no display if export not available // no display if export not available
if ($('div').is('#export')) { if ($('div').is('#export')) {
$('#button_export').show(); $('#button_export').show();
$('.js-export-action').sideNav({ edge: 'right' }); $('#export.sidenav').sidenav({ edge: 'right' });
} }
} }

21
assets/scss/_dark_theme.scss
View file

@ -12,9 +12,9 @@
.collapsible-header, .collapsible-header,
.collection, .collection,
.dropdown-content, .dropdown-content,
.side-nav, .sidenav,
.side-nav .collapsible-body, .sidenav .collapsible-body,
.side-nav.fixed .collapsible-body, .sidenav.sidenav-fixed .collapsible-body,
.tabs { .tabs {
background-color: #131716; background-color: #131716;
} }
@ -59,10 +59,11 @@
#article article h5, #article article h5,
#article article h6, #article article h6,
.dropdown-content li > a, .dropdown-content li > a,
.nav-panels .input-field input:focus, .input-field input,
.input-field input:focus,
.results-item, .results-item,
.side-nav li > a, .sidenav li > a,
.side-nav li > a > i.material-icons { .sidenav li > a > i.material-icons {
color: #dfdfdf; color: #dfdfdf;
} }
@ -81,14 +82,14 @@
color: #dfdfdf !important; color: #dfdfdf !important;
} }
.side-nav li.active { .sidenav li.active {
background-color: #2f2f2f; background-color: #2f2f2f;
} }
.mass-action-tags .mass-action-tags-input.mass-action-tags-input, .mass-action-tags .mass-action-tags-input.mass-action-tags-input,
.side-nav li:not(.logo) > a:hover, .sidenav li:not(.logo) > a:hover,
.side-nav .collapsible-header:hover, .sidenav .collapsible-header:hover,
.side-nav.fixed .collapsible-header:hover { .sidenav.sidenav-fixed .collapsible-header:hover {
background-color: #1d1d1d; background-color: #1d1d1d;
} }

4
assets/scss/_nav.scss
View file

@ -16,7 +16,7 @@ nav {
} }
} }
.nav-panel-item .button-collapse { .nav-panel-item .sidenav-trigger {
margin-left: 0; margin-left: 0;
margin-right: 0.5rem; margin-right: 0.5rem;
padding-left: 0.5rem; padding-left: 0.5rem;
@ -183,7 +183,7 @@ nav {
justify-content: end; justify-content: end;
} }
.button-collapse { .sidenav-trigger {
display: none; display: none;
} }

13
assets/scss/_sidenav.scss
View file

@ -1,8 +1,8 @@
/* ========================================================================== /* ==========================================================================
Side-nav Sidenav
========================================================================== */ ========================================================================== */
.side-nav { .sidenav {
width: 240px; width: 240px;
li { li {
@ -22,14 +22,14 @@
margin: 0; margin: 0;
} }
&.fixed a { &.sidenav-fixed a {
font-size: 13px; font-size: 13px;
line-height: 44px; line-height: 44px;
height: 44px; height: 44px;
} }
.collapsible-header, .collapsible-header,
&.fixed .collapsible-header { &.sidenav-fixed .collapsible-header {
height: 45px; height: 45px;
line-height: 44px; line-height: 44px;
padding: 0 20px; padding: 0 20px;
@ -48,3 +48,8 @@
.items-number { .items-number {
float: right; float: right;
} }
.button-filters .sidenav-trigger,
.button-export .sidenav-trigger {
display: block;
}

2
package.json
View file

@ -80,6 +80,7 @@
"@fontsource/eb-garamond": "^5.1.2", "@fontsource/eb-garamond": "^5.1.2",
"@fontsource/montserrat": "^5.1.1", "@fontsource/montserrat": "^5.1.1",
"@fontsource/oswald": "^5.1.1", "@fontsource/oswald": "^5.1.1",
"@materializecss/materialize": "^1.2.2",
"annotator": "wallabag/annotator#master", "annotator": "wallabag/annotator#master",
"clipboard": "^2.0.11", "clipboard": "^2.0.11",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
@ -89,7 +90,6 @@
"jquery.cookie": "^1.4.1", "jquery.cookie": "^1.4.1",
"jr-qrcode": "^1.2.1", "jr-qrcode": "^1.2.1",
"material-design-icons-iconfont": "^6.7.0", "material-design-icons-iconfont": "^6.7.0",
"materialize-css": "^0.100.2",
"mathjax": "^3.2.2", "mathjax": "^3.2.2",
"mousetrap": "^1.6.0", "mousetrap": "^1.6.0",
"open-dyslexic": "^1.0.3", "open-dyslexic": "^1.0.3",

8
templates/Authentication/form.html.twig
View file

@ -21,9 +21,11 @@
</div> </div>
{% if displayTrustedOption %} {% if displayTrustedOption %}
<div class="input-field col s12"> <div class="input-field col s12 with-checkbox">
<input id="_trusted" type="checkbox" name="{{ trustedParameterName }}" /> <label for="_trusted">
<label for="_trusted">{{ "trusted"|trans({}, 'SchebTwoFactorBundle') }}</label> <input id="_trusted" type="checkbox" name="{{ trustedParameterName }}"/>
<span>{{ "trusted"|trans({}, 'SchebTwoFactorBundle') }}</span>
</label>
</div> </div>
{% endif %} {% endif %}
</div> </div>

40
templates/Entry/entries.html.twig
View file

@ -86,7 +86,7 @@
{% endif %} {% endif %}
<!-- Export --> <!-- Export -->
<div id="export" class="side-nav right-aligned"> <div id="export" class="sidenav">
{% set current_tag = null %} {% set current_tag = null %}
{% if tag is defined %} {% if tag is defined %}
{% set current_tag = tag.slug %} {% set current_tag = tag.slug %}
@ -111,7 +111,7 @@
<!-- Filters --> <!-- Filters -->
{% if form is not null and is_granted('LIST_ENTRIES') %} {% if form is not null and is_granted('LIST_ENTRIES') %}
<div id="filters" class="side-nav right-aligned"> <div id="filters" class="sidenav">
<form action="{{ path('all') }}"> <form action="{{ path('all') }}">
<h4 class="center">{{ 'entry.filters.title'|trans }}</h4> <h4 class="center">{{ 'entry.filters.title'|trans }}</h4>
@ -128,28 +128,38 @@
</div> </div>
<div class="input-field col s6 with-checkbox"> <div class="input-field col s6 with-checkbox">
<label for="{{ form.isArchived.vars.id }}">
{{ form_widget(form.isArchived) }} {{ form_widget(form.isArchived) }}
{{ form_label(form.isArchived) }} <span>{{ form.isArchived.vars.label|trans }}</span>
</label>
</div> </div>
<div class="input-field col s6 with-checkbox"> <div class="input-field col s6 with-checkbox">
<label for="{{ form.isStarred.vars.id }}">
{{ form_widget(form.isStarred) }} {{ form_widget(form.isStarred) }}
{{ form_label(form.isStarred) }} <span>{{ form.isStarred.vars.label|trans }}</span>
</label>
</div> </div>
<div class="input-field col s12 with-checkbox"> <div class="input-field col s12 with-checkbox">
<label for="{{ form.isUnread.vars.id }}">
{{ form_widget(form.isUnread) }} {{ form_widget(form.isUnread) }}
{{ form_label(form.isUnread) }} <span>{{ form.isUnread.vars.label|trans }}</span>
</label>
</div> </div>
<div class="input-field col s12 with-checkbox"> <div class="input-field col s12 with-checkbox">
<label for="{{ form.isAnnotated.vars.id }}">
{{ form_widget(form.isAnnotated) }} {{ form_widget(form.isAnnotated) }}
{{ form_label(form.isAnnotated) }} <span>{{ form.isAnnotated.vars.label|trans }}</span>
</label>
</div> </div>
<div class="input-field col s12 with-checkbox"> <div class="input-field col s12 with-checkbox">
<label for="{{ form.isNotParsed.vars.id }}">
{{ form_widget(form.isNotParsed) }} {{ form_widget(form.isNotParsed) }}
{{ form_label(form.isNotParsed) }} <span>{{ form.isNotParsed.vars.label|trans }}</span>
</label>
</div> </div>
<div class="col s12"> <div class="col s12">
@ -157,8 +167,10 @@
</div> </div>
<div class="input-field col s12 with-checkbox"> <div class="input-field col s12 with-checkbox">
<label for="{{ form.previewPicture.vars.id }}">
{{ form_widget(form.previewPicture) }} {{ form_widget(form.previewPicture) }}
{{ form_label(form.previewPicture) }} <span>{{ form.previewPicture.vars.label|trans }}</span>
</label>
</div> </div>
<div class="col s12"> <div class="col s12">
@ -166,8 +178,10 @@
</div> </div>
<div class="input-field col s12 with-checkbox"> <div class="input-field col s12 with-checkbox">
<label for="{{ form.isPublic.vars.id }}">
{{ form_widget(form.isPublic) }} {{ form_widget(form.isPublic) }}
{{ form_label(form.isPublic) }} <span>{{ form.isPublic.vars.label|trans }}</span>
</label>
</div> </div>
<div class="col s12"> <div class="col s12">
@ -209,12 +223,12 @@
{{ form_label(form.createdAt) }} {{ form_label(form.createdAt) }}
</div> </div>
<div class="input-field col s6"> <div class="input-field col s12">
{{ form_widget(form.createdAt.left_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.left_date.vars.value}}) }} {{ form_widget(form.createdAt.left_date, {'type': 'date', 'attr': {'data-value': form.createdAt.left_date.vars.value}}) }}
<label for="entry_filter_createdAt_left_date" class="active">{{ 'entry.filters.created_at.from'|trans }}</label> <label for="entry_filter_createdAt_left_date" class="active">{{ 'entry.filters.created_at.from'|trans }}</label>
</div> </div>
<div class="input-field col s6"> <div class="input-field col s12">
{{ form_widget(form.createdAt.right_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.right_date.vars.value}}) }} {{ form_widget(form.createdAt.right_date, {'type': 'date', 'attr': {'data-value': form.createdAt.right_date.vars.value}}) }}
<label for="entry_filter_createdAt_right_date" class="active">{{ 'entry.filters.created_at.to'|trans }}</label> <label for="entry_filter_createdAt_right_date" class="active">{{ 'entry.filters.created_at.to'|trans }}</label>
</div> </div>

4
templates/Entry/entry.html.twig
View file

@ -14,7 +14,7 @@
<div class="nav-panel-item cyan darken-1"> <div class="nav-panel-item cyan darken-1">
<ul> <ul>
<li> <li>
<a href="#" data-activates="slide-out" class="button-collapse"> <a href="#" data-target="slide-out" class="sidenav-trigger">
<i class="material-icons">menu</i> <i class="material-icons">menu</i>
</a> </a>
</li> </li>
@ -42,7 +42,7 @@
</ul> </ul>
</div> </div>
</nav> </nav>
<ul id="slide-out" class="left-bar collapsible side-nav fixed reader-mode" data-collapsible="accordion"> <ul id="slide-out" class="left-bar collapsible sidenav sidenav-fixed reader-mode" data-collapsible="accordion">
<li class="bold border-bottom hide-on-med-and-down"> <li class="bold border-bottom hide-on-med-and-down">
<a class="waves-effect collapsible-header" href="{{ path('homepage') }}"> <a class="waves-effect collapsible-header" href="{{ path('homepage') }}">
<i class="material-icons small">arrow_back</i> <i class="material-icons small">arrow_back</i>

8
templates/Import/Chrome/index.html.twig
View file

@ -26,10 +26,12 @@
<input class="file-path validate" type="text"> <input class="file-path validate" type="text">
</div> </div>
</div> </div>
<div class="input-field col s6 with-checkbox"> <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6> <div class="col s6 with-checkbox">
<label for="{{ form.mark_as_read.vars.id }}">
{{ form_widget(form.mark_as_read) }} {{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }} <span>{{ form.mark_as_read.vars.label|trans }}</span>
</label>
</div> </div>
</div> </div>

8
templates/Import/Delicious/index.html.twig
View file

@ -26,10 +26,12 @@
<input class="file-path validate" type="text"> <input class="file-path validate" type="text">
</div> </div>
</div> </div>
<div class="input-field col s6 with-checkbox"> <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6> <div class="col s6 with-checkbox">
<label for="{{ form.mark_as_read.vars.id }}">
{{ form_widget(form.mark_as_read) }} {{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }} <span>{{ form.mark_as_read.vars.label|trans }}</span>
</label>
</div> </div>
</div> </div>

8
templates/Import/Elcurator/index.html.twig
View file

@ -26,10 +26,12 @@
<input class="file-path validate" type="text"> <input class="file-path validate" type="text">
</div> </div>
</div> </div>
<div class="input-field col s6 with-checkbox"> <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6> <div class="col s6 with-checkbox">
<label for="{{ form.mark_as_read.vars.id }}">
{{ form_widget(form.mark_as_read) }} {{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }} <span>{{ form.mark_as_read.vars.label|trans }}</span>
</label>
</div> </div>
</div> </div>

8
templates/Import/Firefox/index.html.twig
View file

@ -26,10 +26,12 @@
<input class="file-path validate" type="text"> <input class="file-path validate" type="text">
</div> </div>
</div> </div>
<div class="input-field col s6 with-checkbox"> <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6> <div class="col s6 with-checkbox">
<label for="{{ form.mark_as_read.vars.id }}">
{{ form_widget(form.mark_as_read) }} {{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }} <span>{{ form.mark_as_read.vars.label|trans }}</span>
</label>
</div> </div>
</div> </div>

8
templates/Import/Instapaper/index.html.twig
View file

@ -26,10 +26,12 @@
<input class="file-path validate" type="text"> <input class="file-path validate" type="text">
</div> </div>
</div> </div>
<div class="input-field col s6 with-checkbox"> <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6> <div class="col s6 with-checkbox">
<label for="{{ form.mark_as_read.vars.id }}">
{{ form_widget(form.mark_as_read) }} {{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }} <span>{{ form.mark_as_read.vars.label|trans }}</span>
</label>
</div> </div>
</div> </div>

8
templates/Import/Omnivore/index.html.twig
View file

@ -26,10 +26,12 @@
<input class="file-path validate" type="text"> <input class="file-path validate" type="text">
</div> </div>
</div> </div>
<div class="input-field col s6 with-checkbox"> <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6> <div class="col s6 with-checkbox">
<label for="{{ form.mark_as_read.vars.id }}">
{{ form_widget(form.mark_as_read) }} {{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }} <span>{{ form.mark_as_read.vars.label|trans }}</span>
</label>
</div> </div>
</div> </div>

8
templates/Import/Pinboard/index.html.twig
View file

@ -26,10 +26,12 @@
<input class="file-path validate" type="text"> <input class="file-path validate" type="text">
</div> </div>
</div> </div>
<div class="input-field col s6 with-checkbox"> <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6> <div class="col s6 with-checkbox">
<label for="{{ form.mark_as_read.vars.id }}">
{{ form_widget(form.mark_as_read) }} {{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }} <span>{{ form.mark_as_read.vars.label|trans }}</span>
</label>
</div> </div>
</div> </div>

8
templates/Import/Pocket/index.html.twig
View file

@ -21,10 +21,12 @@
<form method="post" action="{{ path('import_pocket_auth') }}"> <form method="post" action="{{ path('import_pocket_auth') }}">
<div class="row"> <div class="row">
<div class="input-field col s6 with-checkbox"> <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6> <div class="col s6 with-checkbox">
<label for="{{ form.mark_as_read.vars.id }}">
{{ form_widget(form.mark_as_read) }} {{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }} <span>{{ form.mark_as_read.vars.label|trans }}</span>
</label>
</div> </div>
</div> </div>
<button class="btn waves-effect waves-light" type="submit" name="action" {% if not has_consumer_key %}disabled="disabled"{% endif %}> <button class="btn waves-effect waves-light" type="submit" name="action" {% if not has_consumer_key %}disabled="disabled"{% endif %}>

8
templates/Import/PocketHtml/index.html.twig
View file

@ -26,10 +26,12 @@
<input class="file-path validate" type="text"> <input class="file-path validate" type="text">
</div> </div>
</div> </div>
<div class="input-field col s6 with-checkbox"> <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6> <div class="col s6 with-checkbox">
<label for="{{ form.mark_as_read.vars.id }}">
{{ form_widget(form.mark_as_read) }} {{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }} <span>{{ form.mark_as_read.vars.label|trans }}</span>
</label>
</div> </div>
</div> </div>

8
templates/Import/Readability/index.html.twig
View file

@ -26,10 +26,12 @@
<input class="file-path validate" type="text"> <input class="file-path validate" type="text">
</div> </div>
</div> </div>
<div class="input-field col s6 with-checkbox"> <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6> <div class="col s6 with-checkbox">
<label for="{{ form.mark_as_read.vars.id }}">
{{ form_widget(form.mark_as_read) }} {{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }} <span>{{ form.mark_as_read.vars.label|trans }}</span>
</label>
</div> </div>
</div> </div>

8
templates/Import/Shaarli/index.html.twig
View file

@ -26,10 +26,12 @@
<input class="file-path validate" type="text"> <input class="file-path validate" type="text">
</div> </div>
</div> </div>
<div class="input-field col s6 with-checkbox"> <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6> <div class="col s6 with-checkbox">
<label for="{{ form.mark_as_read.vars.id }}">
{{ form_widget(form.mark_as_read) }} {{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }} <span>{{ form.mark_as_read.vars.label|trans }}</span>
</label>
</div> </div>
</div> </div>

8
templates/Import/WallabagV1/index.html.twig
View file

@ -26,10 +26,12 @@
<input class="file-path validate" type="text"> <input class="file-path validate" type="text">
</div> </div>
</div> </div>
<div class="input-field col s6 with-checkbox"> <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6> <div class="col s6 with-checkbox">
<label for="{{ form.mark_as_read.vars.id }}">
{{ form_widget(form.mark_as_read) }} {{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }} <span>{{ form.mark_as_read.vars.label|trans }}</span>
</label>
</div> </div>
</div> </div>

4
templates/bundles/CraueConfigBundle/Settings/modify.html.twig
View file

@ -22,9 +22,13 @@
<div id="set-{{ section }}" class="col s12"> <div id="set-{{ section }}" class="col s12">
{% for setting in form.settings %} {% for setting in form.settings %}
{% if setting.vars.value.section == section %} {% if setting.vars.value.section == section %}
<div class="row">
<div class="input-field col s12">
{{ form_row(setting.value, { {{ form_row(setting.value, {
'label': setting.vars.value.name|trans({}, 'CraueConfigBundle'), 'label': setting.vars.value.name|trans({}, 'CraueConfigBundle'),
}) }} }) }}
</div>
</div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>

8
templates/bundles/FOSUserBundle/Security/login.html.twig
View file

@ -24,9 +24,11 @@
<input type="password" id="password" name="_password" /> <input type="password" id="password" name="_password" />
</div> </div>
<div class="input-field col s12"> <div class="input-field col s12 with-checkbox">
<input type="checkbox" id="remember_me" name="_remember_me" checked /> <label for="remember_me">
<label for="remember_me">{{ 'security.login.keep_logged_in'|trans }}</label> <input type="checkbox" id="remember_me" name="_remember_me" checked/>
<span>{{ 'security.login.keep_logged_in'|trans }}</span>
</label>
</div> </div>
</div> </div>

10
templates/layout.html.twig
View file

@ -27,7 +27,7 @@
{% block menu %} {% block menu %}
<nav class="cyan darken-1"> <nav class="cyan darken-1">
<ul id="slide-out" class="left-bar side-nav fixed"> <ul id="slide-out" class="left-bar sidenav sidenav-fixed">
{% block logo %} {% block logo %}
<li class="logo border-bottom"> <li class="logo border-bottom">
{% if is_granted('LIST_ENTRIES') %} {% if is_granted('LIST_ENTRIES') %}
@ -82,7 +82,7 @@
<div class="nav-panels"> <div class="nav-panels">
<div class="nav-panel-actions nav-panel-item"> <div class="nav-panel-actions nav-panel-item">
<div class="nav-panel-top"> <div class="nav-panel-top">
<button data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="material-icons">menu</i></button> <a href="#" data-target="slide-out" class="nav-panel-menu sidenav-trigger"><i class="material-icons">menu</i></a>
<h1 class="left action"> <h1 class="left action">
{% block title %} {% block title %}
{% endblock %} {% endblock %}
@ -107,17 +107,17 @@
</li> </li>
{% endif %} {% endif %}
<li id="button_filters" class="button-filters"> <li id="button_filters" class="button-filters">
<a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters"> <a class="nav-panel-menu sidenav-trigger tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-target="filters">
<i class="material-icons">filter_list</i> <i class="material-icons">filter_list</i>
</a> </a>
</li> </li>
<li id="button_export" class="button-export"> <li id="button_export" class="button-export">
<a class="nav-panel-menu button-collapse-right tooltipped js-export-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export"> <a class="nav-panel-menu sidenav-trigger tooltipped js-export-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-target="export">
<i class="material-icons">file_download</i> <i class="material-icons">file_download</i>
</a> </a>
</li> </li>
<li class="bold"> <li class="bold">
<a class="wave-effect tooltipped dropdown-button" data-beloworigin="true" data-constrainwidth="false" data-activates="dropdown-account" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.account'|trans }}" href="#" id="news_menu"> <a class="wave-effect tooltipped dropdown-trigger" data-covertrigger="false" data-constrainwidth="false" data-target="dropdown-account" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.account'|trans }}" href="#" id="news_menu">
<i class="material-icons" id="news_link">account_circle</i> <i class="material-icons" id="news_link">account_circle</i>
</a> </a>
</li> </li>

15
yarn.lock
View file

@ -1003,6 +1003,11 @@
"@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/resolve-uri" "^3.1.0"
"@jridgewell/sourcemap-codec" "^1.4.14" "@jridgewell/sourcemap-codec" "^1.4.14"
"@materializecss/materialize@^1.2.2":
version "1.2.2"
resolved "https://registry.yarnpkg.com/@materializecss/materialize/-/materialize-1.2.2.tgz#3308e76806a8f6d14b7838656fbf24e0bf3496c8"
integrity sha512-+zp/myqWFywj/F64byUM+H3iiuDmVjKBHZ0lj3b07QiaLVaNoUBCcsS0nkdwB9YsebzFpZLWeASPkmolu3yA+Q==
"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
version "5.1.1-v1" version "5.1.1-v1"
resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129" resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
@ -3364,7 +3369,7 @@ jquery@^1.11.3:
resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.12.4.tgz#01e1dfba290fe73deba77ceeacb0f9ba2fec9e0c" resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.12.4.tgz#01e1dfba290fe73deba77ceeacb0f9ba2fec9e0c"
integrity sha512-UEVp7PPK9xXYSk8xqXCJrkXnKZtlgWkd2GsAQbMRFK6S/ePU2JN5G2Zum8hIVjzR3CpdfSqdqAzId/xd4TJHeg== integrity sha512-UEVp7PPK9xXYSk8xqXCJrkXnKZtlgWkd2GsAQbMRFK6S/ePU2JN5G2Zum8hIVjzR3CpdfSqdqAzId/xd4TJHeg==
"jquery@^3.0.0 || ^2.1.4", jquery@^3.7.1: jquery@^3.7.1:
version "3.7.1" version "3.7.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg== integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
@ -3572,14 +3577,6 @@ material-design-icons-iconfont@^6.7.0:
resolved "https://registry.yarnpkg.com/material-design-icons-iconfont/-/material-design-icons-iconfont-6.7.0.tgz#55cf0f3d7e4c76e032855b7e810b6e30535eff3c" resolved "https://registry.yarnpkg.com/material-design-icons-iconfont/-/material-design-icons-iconfont-6.7.0.tgz#55cf0f3d7e4c76e032855b7e810b6e30535eff3c"
integrity sha512-lSj71DgVv20kO0kGbs42icDzbRot61gEDBLQACzkUuznRQBUYmbxzEkGU6dNBb5fRWHMaScYlAXX96HQ4/cJWA== integrity sha512-lSj71DgVv20kO0kGbs42icDzbRot61gEDBLQACzkUuznRQBUYmbxzEkGU6dNBb5fRWHMaScYlAXX96HQ4/cJWA==
materialize-css@^0.100.2:
version "0.100.2"
resolved "https://registry.yarnpkg.com/materialize-css/-/materialize-css-0.100.2.tgz#9ca32b24904c9a04491fc7d0a2e9402e7b1dae07"
integrity sha512-Bf4YeoJCIdk4dlpnmVX+DIOJBbqOKwfBPD+tT5bxwXNFMLk649CGbldqtnctkkfMp+fGgSAsdYu9lo1ZolZqgA==
dependencies:
hammerjs "^2.0.8"
jquery "^3.0.0 || ^2.1.4"
mathjax@^3.2.2: mathjax@^3.2.2:
version "3.2.2" version "3.2.2"
resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-3.2.2.tgz#c754d7b46a679d7f3fa03543d6b8bf124ddf9f6b" resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-3.2.2.tgz#c754d7b46a679d7f3fa03543d6b8bf124ddf9f6b"