diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d36956b95..52ea76b63 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,9 +15,9 @@ updates: patterns: - "*fontsource*" ignore: - - dependency-name: materialize-css + - dependency-name: @materializecss/materialize versions: - - "> 0.98.2" + - "> 1.2.2" - package-ecosystem: composer directory: "/" schedule: diff --git a/assets/index.js b/assets/index.js index 8fe90fc4e..700ff228b 100755 --- a/assets/index.js +++ b/assets/index.js @@ -1,8 +1,8 @@ import $ from 'jquery'; /* Materialize imports */ -import 'materialize-css/dist/css/materialize.css'; -import 'materialize-css/dist/js/materialize'; +import '@materializecss/materialize/dist/css/materialize.css'; +import '@materializecss/materialize/dist/js/materialize'; /* Annotations */ import annotator from 'annotator'; @@ -272,22 +272,23 @@ const articleScroll = () => { }; $(document).ready(() => { - // sideNav - $('.button-collapse').sideNav(); - $('select').material_select(); - $('.collapsible').collapsible({ + // sidenav + $('.sidenav').sidenav(); + $('select').formSelect(); + $('.collapsible[data-collapsible="accordion"]').collapsible(); + $('.collapsible[data-collapsible="expandable"]').collapsible({ 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[data-covertrigger="false"][data-constrainwidth="false"]').dropdown({ + hover: false, + coverTrigger: false, + constrainWidth: false, + }); + + $('.tabs').tabs(); + $('.tooltipped').tooltip(); initFilters(); initExport(); @@ -306,7 +307,7 @@ $(document).ready(() => { $('.nav-panel-add-tag').toggle(100); $('.nav-panel-menu').addClass('hidden'); if (window.innerWidth < mobileMaxWidth) { - $('.side-nav').sideNav('hide'); + $('.sidenav').sidenav('close'); } $('#tag_label').focus(); return false; diff --git a/assets/js/shortcuts/entry.js b/assets/js/shortcuts/entry.js index e19800bd3..3c15f3d29 100644 --- a/assets/js/shortcuts/entry.js +++ b/assets/js/shortcuts/entry.js @@ -5,22 +5,22 @@ $(document).ready(() => { if ($('#article').length > 0) { /* open original article */ Mousetrap.bind('o', () => { - $('ul.side-nav a.original i')[0].click(); + $('ul.sidenav a.original i')[0].click(); }); /* mark as favorite */ Mousetrap.bind('f', () => { - $('ul.side-nav a.favorite i')[0].click(); + $('ul.sidenav a.favorite i')[0].click(); }); /* mark as read */ Mousetrap.bind('a', () => { - $('ul.side-nav a.markasread i')[0].click(); + $('ul.sidenav a.markasread i')[0].click(); }); /* delete */ Mousetrap.bind('del', () => { - $('ul.side-nav a.delete i')[0].click(); + $('ul.sidenav a.delete i')[0].click(); }); } }); diff --git a/assets/js/tools.js b/assets/js/tools.js index 9567815f3..cd7d1db3b 100644 --- a/assets/js/tools.js +++ b/assets/js/tools.js @@ -32,7 +32,7 @@ function initFilters() { // no display if filters not available if ($('div').is('#filters')) { $('#button_filters').show(); - $('.js-filters-action').sideNav({ edge: 'right' }); + $('#filters.sidenav').sidenav({ edge: 'right' }); $('#clear_form_filters').on('click', () => { $('#filters input').val(''); $('#filters :checked').removeAttr('checked'); @@ -46,7 +46,7 @@ function initExport() { // no display if export not available if ($('div').is('#export')) { $('#button_export').show(); - $('.js-export-action').sideNav({ edge: 'right' }); + $('#export.sidenav').sidenav({ edge: 'right' }); } } diff --git a/assets/scss/_dark_theme.scss b/assets/scss/_dark_theme.scss index ac38b566d..612876b09 100644 --- a/assets/scss/_dark_theme.scss +++ b/assets/scss/_dark_theme.scss @@ -12,9 +12,9 @@ .collapsible-header, .collection, .dropdown-content, - .side-nav, - .side-nav .collapsible-body, - .side-nav.fixed .collapsible-body, + .sidenav, + .sidenav .collapsible-body, + .sidenav.sidenav-fixed .collapsible-body, .tabs { background-color: #131716; } @@ -59,10 +59,11 @@ #article article h5, #article article h6, .dropdown-content li > a, - .nav-panels .input-field input:focus, + .input-field input, + .input-field input:focus, .results-item, - .side-nav li > a, - .side-nav li > a > i.material-icons { + .sidenav li > a, + .sidenav li > a > i.material-icons { color: #dfdfdf; } @@ -81,14 +82,14 @@ color: #dfdfdf !important; } - .side-nav li.active { + .sidenav li.active { background-color: #2f2f2f; } .mass-action-tags .mass-action-tags-input.mass-action-tags-input, - .side-nav li:not(.logo) > a:hover, - .side-nav .collapsible-header:hover, - .side-nav.fixed .collapsible-header:hover { + .sidenav li:not(.logo) > a:hover, + .sidenav .collapsible-header:hover, + .sidenav.sidenav-fixed .collapsible-header:hover { background-color: #1d1d1d; } diff --git a/assets/scss/_nav.scss b/assets/scss/_nav.scss index a085febd9..798a3a44a 100644 --- a/assets/scss/_nav.scss +++ b/assets/scss/_nav.scss @@ -16,7 +16,7 @@ nav { } } -.nav-panel-item .button-collapse { +.nav-panel-item .sidenav-trigger { margin-left: 0; margin-right: 0.5rem; padding-left: 0.5rem; @@ -183,7 +183,7 @@ nav { justify-content: end; } - .button-collapse { + .sidenav-trigger { display: none; } diff --git a/assets/scss/_sidenav.scss b/assets/scss/_sidenav.scss index 00e4c5c2a..d57992063 100644 --- a/assets/scss/_sidenav.scss +++ b/assets/scss/_sidenav.scss @@ -1,8 +1,8 @@ /* ========================================================================== - Side-nav + Sidenav ========================================================================== */ -.side-nav { +.sidenav { width: 240px; li { @@ -22,14 +22,14 @@ margin: 0; } - &.fixed a { + &.sidenav-fixed a { font-size: 13px; line-height: 44px; height: 44px; } .collapsible-header, - &.fixed .collapsible-header { + &.sidenav-fixed .collapsible-header { height: 45px; line-height: 44px; padding: 0 20px; @@ -48,3 +48,8 @@ .items-number { float: right; } + +.button-filters .sidenav-trigger, +.button-export .sidenav-trigger { + display: block; +} diff --git a/package.json b/package.json index e1ecccb5a..86584256f 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "@fontsource/eb-garamond": "^5.1.2", "@fontsource/montserrat": "^5.1.1", "@fontsource/oswald": "^5.1.1", + "@materializecss/materialize": "^1.2.2", "annotator": "wallabag/annotator#master", "clipboard": "^2.0.11", "hammerjs": "^2.0.8", @@ -89,7 +90,6 @@ "jquery.cookie": "^1.4.1", "jr-qrcode": "^1.2.1", "material-design-icons-iconfont": "^6.7.0", - "materialize-css": "^0.100.2", "mathjax": "^3.2.2", "mousetrap": "^1.6.0", "open-dyslexic": "^1.0.3", diff --git a/templates/Authentication/form.html.twig b/templates/Authentication/form.html.twig index e3d1f2f6a..e6c896ca5 100644 --- a/templates/Authentication/form.html.twig +++ b/templates/Authentication/form.html.twig @@ -21,9 +21,11 @@ {% if displayTrustedOption %} -
- - +
+
{% endif %}
diff --git a/templates/Entry/entries.html.twig b/templates/Entry/entries.html.twig index 1dc4f16fd..22b77a0c3 100644 --- a/templates/Entry/entries.html.twig +++ b/templates/Entry/entries.html.twig @@ -86,7 +86,7 @@ {% endif %} -
+
{% set current_tag = null %} {% if tag is defined %} {% set current_tag = tag.slug %} @@ -111,7 +111,7 @@ {% if form is not null and is_granted('LIST_ENTRIES') %} -
+

{{ 'entry.filters.title'|trans }}

@@ -128,28 +128,38 @@
- {{ form_widget(form.isArchived) }} - {{ form_label(form.isArchived) }} +
- {{ form_widget(form.isStarred) }} - {{ form_label(form.isStarred) }} +
- {{ form_widget(form.isUnread) }} - {{ form_label(form.isUnread) }} +
- {{ form_widget(form.isAnnotated) }} - {{ form_label(form.isAnnotated) }} +
- {{ form_widget(form.isNotParsed) }} - {{ form_label(form.isNotParsed) }} +
@@ -157,8 +167,10 @@
- {{ form_widget(form.previewPicture) }} - {{ form_label(form.previewPicture) }} +
@@ -166,8 +178,10 @@
- {{ form_widget(form.isPublic) }} - {{ form_label(form.isPublic) }} +
@@ -209,12 +223,12 @@ {{ form_label(form.createdAt) }}
-
- {{ 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}}) }}
-
- {{ 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}}) }}
diff --git a/templates/Entry/entry.html.twig b/templates/Entry/entry.html.twig index d3714acf6..13bb249bc 100644 --- a/templates/Entry/entry.html.twig +++ b/templates/Entry/entry.html.twig @@ -14,7 +14,7 @@ -
-
-
{{ 'import.form.mark_as_read_title'|trans }}
- {{ form_widget(form.mark_as_read) }} - {{ form_label(form.mark_as_read) }} +
{{ 'import.form.mark_as_read_title'|trans }}
+
+
diff --git a/templates/Import/Delicious/index.html.twig b/templates/Import/Delicious/index.html.twig index 445e1aa6e..e9356f6b9 100644 --- a/templates/Import/Delicious/index.html.twig +++ b/templates/Import/Delicious/index.html.twig @@ -26,10 +26,12 @@
-
-
{{ 'import.form.mark_as_read_title'|trans }}
- {{ form_widget(form.mark_as_read) }} - {{ form_label(form.mark_as_read) }} +
{{ 'import.form.mark_as_read_title'|trans }}
+
+
diff --git a/templates/Import/Elcurator/index.html.twig b/templates/Import/Elcurator/index.html.twig index 7236f7be5..d0479a8d0 100644 --- a/templates/Import/Elcurator/index.html.twig +++ b/templates/Import/Elcurator/index.html.twig @@ -26,10 +26,12 @@
-
-
{{ 'import.form.mark_as_read_title'|trans }}
- {{ form_widget(form.mark_as_read) }} - {{ form_label(form.mark_as_read) }} +
{{ 'import.form.mark_as_read_title'|trans }}
+
+
diff --git a/templates/Import/Firefox/index.html.twig b/templates/Import/Firefox/index.html.twig index f16604fe3..239b9a3ee 100644 --- a/templates/Import/Firefox/index.html.twig +++ b/templates/Import/Firefox/index.html.twig @@ -26,10 +26,12 @@ -
-
{{ 'import.form.mark_as_read_title'|trans }}
- {{ form_widget(form.mark_as_read) }} - {{ form_label(form.mark_as_read) }} +
{{ 'import.form.mark_as_read_title'|trans }}
+
+
diff --git a/templates/Import/Instapaper/index.html.twig b/templates/Import/Instapaper/index.html.twig index 4fdc5ed96..ea9039c22 100644 --- a/templates/Import/Instapaper/index.html.twig +++ b/templates/Import/Instapaper/index.html.twig @@ -26,10 +26,12 @@ -
-
{{ 'import.form.mark_as_read_title'|trans }}
- {{ form_widget(form.mark_as_read) }} - {{ form_label(form.mark_as_read) }} +
{{ 'import.form.mark_as_read_title'|trans }}
+
+
diff --git a/templates/Import/Omnivore/index.html.twig b/templates/Import/Omnivore/index.html.twig index 045668321..3aa09e25c 100644 --- a/templates/Import/Omnivore/index.html.twig +++ b/templates/Import/Omnivore/index.html.twig @@ -26,10 +26,12 @@ -
-
{{ 'import.form.mark_as_read_title'|trans }}
- {{ form_widget(form.mark_as_read) }} - {{ form_label(form.mark_as_read) }} +
{{ 'import.form.mark_as_read_title'|trans }}
+
+
diff --git a/templates/Import/Pinboard/index.html.twig b/templates/Import/Pinboard/index.html.twig index 458a089f4..58a956d77 100644 --- a/templates/Import/Pinboard/index.html.twig +++ b/templates/Import/Pinboard/index.html.twig @@ -26,10 +26,12 @@ -
-
{{ 'import.form.mark_as_read_title'|trans }}
- {{ form_widget(form.mark_as_read) }} - {{ form_label(form.mark_as_read) }} +
{{ 'import.form.mark_as_read_title'|trans }}
+
+
diff --git a/templates/Import/Pocket/index.html.twig b/templates/Import/Pocket/index.html.twig index 11eda98a9..50995941f 100644 --- a/templates/Import/Pocket/index.html.twig +++ b/templates/Import/Pocket/index.html.twig @@ -21,10 +21,12 @@
-
-
{{ 'import.form.mark_as_read_title'|trans }}
- {{ form_widget(form.mark_as_read) }} - {{ form_label(form.mark_as_read) }} +
{{ 'import.form.mark_as_read_title'|trans }}
+
+
-
-
{{ 'import.form.mark_as_read_title'|trans }}
- {{ form_widget(form.mark_as_read) }} - {{ form_label(form.mark_as_read) }} +
{{ 'import.form.mark_as_read_title'|trans }}
+
+
diff --git a/templates/Import/Readability/index.html.twig b/templates/Import/Readability/index.html.twig index 12831e1bf..f97cf77e8 100644 --- a/templates/Import/Readability/index.html.twig +++ b/templates/Import/Readability/index.html.twig @@ -26,10 +26,12 @@ -
-
{{ 'import.form.mark_as_read_title'|trans }}
- {{ form_widget(form.mark_as_read) }} - {{ form_label(form.mark_as_read) }} +
{{ 'import.form.mark_as_read_title'|trans }}
+
+
diff --git a/templates/Import/Shaarli/index.html.twig b/templates/Import/Shaarli/index.html.twig index 2091d6838..6cbf5049f 100644 --- a/templates/Import/Shaarli/index.html.twig +++ b/templates/Import/Shaarli/index.html.twig @@ -26,10 +26,12 @@ -
-
{{ 'import.form.mark_as_read_title'|trans }}
- {{ form_widget(form.mark_as_read) }} - {{ form_label(form.mark_as_read) }} +
{{ 'import.form.mark_as_read_title'|trans }}
+
+
diff --git a/templates/Import/WallabagV1/index.html.twig b/templates/Import/WallabagV1/index.html.twig index d9a87a73c..e48f797d5 100644 --- a/templates/Import/WallabagV1/index.html.twig +++ b/templates/Import/WallabagV1/index.html.twig @@ -26,10 +26,12 @@ -
-
{{ 'import.form.mark_as_read_title'|trans }}
- {{ form_widget(form.mark_as_read) }} - {{ form_label(form.mark_as_read) }} +
{{ 'import.form.mark_as_read_title'|trans }}
+
+
diff --git a/templates/bundles/CraueConfigBundle/Settings/modify.html.twig b/templates/bundles/CraueConfigBundle/Settings/modify.html.twig index 809c6dff1..438b36e03 100644 --- a/templates/bundles/CraueConfigBundle/Settings/modify.html.twig +++ b/templates/bundles/CraueConfigBundle/Settings/modify.html.twig @@ -22,9 +22,13 @@
{% for setting in form.settings %} {% if setting.vars.value.section == section %} - {{ form_row(setting.value, { - 'label': setting.vars.value.name|trans({}, 'CraueConfigBundle'), - }) }} +
+
+ {{ form_row(setting.value, { + 'label': setting.vars.value.name|trans({}, 'CraueConfigBundle'), + }) }} +
+
{% endif %} {% endfor %}
diff --git a/templates/bundles/FOSUserBundle/Security/login.html.twig b/templates/bundles/FOSUserBundle/Security/login.html.twig index 291a0a428..870e4c829 100644 --- a/templates/bundles/FOSUserBundle/Security/login.html.twig +++ b/templates/bundles/FOSUserBundle/Security/login.html.twig @@ -24,9 +24,11 @@ -
- - +
+
diff --git a/templates/layout.html.twig b/templates/layout.html.twig index a1949ae0d..23b433c0c 100644 --- a/templates/layout.html.twig +++ b/templates/layout.html.twig @@ -27,7 +27,7 @@ {% block menu %}