Merge pull request #2142 from wallabag/v2-use-npm

Manage assets through npm

7 files changed, 10 insertions, 10 deletions

diff --git a/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig b/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig
index acf69196..c8471bdd 100644
--- a/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig
@@ -23,10 +23,10 @@
         </div>
     </div>
     <div class="card-action center">
-        <a href="{{ path('fos_user_security_logout') }}" class="waves-effect waves-light grey btn"><i class="material-icons left"></i> {{ 'security.login.cancel'|trans }}</a>
+        <a href="{{ path('fos_user_security_logout') }}" class="waves-effect waves-light grey btn">{{ 'security.login.cancel'|trans }}</a>
         <button class="btn waves-effect waves-light" type="submit" name="send">
             {{ "scheb_two_factor.login"|trans }}
-            <i class="mdi-content-send right"></i>
+            <i class="material-icons right">send</i>
         </button>
     </div>
 </form>
diff --git a/src/Wallabag/UserBundle/Resources/views/Registration/confirmed.html.twig b/src/Wallabag/UserBundle/Resources/views/Registration/confirmed.html.twig
index aa4b9bca..cb8d40a4 100644
--- a/src/Wallabag/UserBundle/Resources/views/Registration/confirmed.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Registration/confirmed.html.twig
@@ -11,7 +11,7 @@
         {% endif %}
     </div>
     <div class="card-action center">
-        <a href="{{ path('homepage') }}" class="waves-effect waves-light btn"><i class="material-icons left"></i> {{ 'security.register.go_to_account'|trans({},'messages') }}</a>
+        <a href="{{ path('homepage') }}" class="waves-effect waves-light btn">{{ 'security.register.go_to_account'|trans({},'messages') }}</a>
     </div>
 </div>
 {% endblock fos_user_content %}
diff --git a/src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig b/src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig
index 7d2b45d4..d0a85fc7 100644
--- a/src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig
@@ -36,10 +36,10 @@
         </div>
     </div>
     <div class="card-action center">
-        <a href="{{ path('fos_user_security_login') }}" class="waves-effect waves-light grey btn"><i class="material-icons left"></i> {{ 'security.login.submit'|trans }}</a>
+        <a href="{{ path('fos_user_security_login') }}" class="waves-effect waves-light grey btn">{{ 'security.login.submit'|trans }}</a>
         <button class="btn waves-effect waves-light" type="submit" name="send">
             {{ 'registration.submit'|trans({}, 'FOSUserBundle') }}
-            <i class="mdi-content-send right"></i>
+            <i class="material-icons right">send</i>
         </button>
     </div>
 </form>
diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig b/src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig
index 7a5ac838..010ee0d0 100644
--- a/src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig
@@ -21,7 +21,7 @@
     </div>
     <div class="card-action center">
         <a href="{{ path('fos_user_security_login') }}" class="waves-effect waves-light grey btn">
-            <i class="material-icons left"></i> {{ 'security.login.submit'|trans({}, "messages") }}
+            {{ 'security.login.submit'|trans({}, "messages") }}
         </a>
         <button class="btn waves-effect waves-light" type="submit" name="send">
             {{ 'resetting.request.submit'|trans }}
diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig b/src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig
index 9d0a061c..a19dc7d2 100644
--- a/src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig
@@ -8,7 +8,7 @@
         <div class="card-action center">
             <button class="btn waves-effect waves-light" type="submit" name="send">
                 {{ 'resetting.reset.submit'|trans }}
-                <i class="mdi-content-send right"></i>
+                <i class="material-icons right">send</i>
             </button>
         </div>
     </div>
diff --git a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
index 982a33b2..8474b497 100644
--- a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
@@ -33,10 +33,10 @@
     </div>
     <div class="card-action center">
         <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
-        <a href="{{ path('fos_user_registration_register') }}" class="waves-effect waves-light grey btn"><i class="material-icons left"></i> {{ 'security.login.register'|trans }}</a>
+        <a href="{{ path('fos_user_registration_register') }}" class="waves-effect waves-light grey btn">{{ 'security.login.register'|trans }}</a>
         <button class="btn waves-effect waves-light" type="submit" name="send">
             {{ 'security.login.submit'|trans }}
-            <i class="mdi-content-send right"></i>
+            <i class="material-icons right">send</i>
         </button>
     </div>
     <div class="center">
diff --git a/src/Wallabag/UserBundle/Resources/views/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/layout.html.twig
index 1d0189ca..1f6ea255 100644
--- a/src/Wallabag/UserBundle/Resources/views/layout.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/layout.html.twig
@@ -11,7 +11,7 @@
 <main class="valign-wrapper">
     <div class="valign row">
         <div class="card sw">
-            <div class="center"><img src="{{ asset('bundles/wallabagcore/themes/material/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
+            <div class="center"><img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
             {% block fos_user_content %}
             {% endblock fos_user_content %}
         </div>