rebase

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2024-06-02 12:11:41 +00:00 · 2017-05-04 14:56:52 +02:00 · 2017-05-04 14:56:52 +02:00 · 18e1da6277
parent 4cea76b0cf
commit 18e1da6277
2 changed files with 6 additions and 1 deletions
--- a/app/Resources/static/themes/material/js/shortcuts/main.js
+++ b/app/Resources/static/themes/material/js/shortcuts/main.js
@ -28,6 +28,11 @@ $(document).ready(() => {
    return;
  }

+  /* Show nothing on login/register page */
+  if ($('#username').length > 0 || $('#fos_user_registration_form_username').length > 0) {
+    return;
+  }
+
  /* Focus current card */
  toggleFocus(card);

--- a/web/bundles/wallabagcore/material.js
+++ b/web/bundles/wallabagcore/material.js