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

Manage assets through npm
author: Nicolas Lœuillet <nicolas@loeuillet.org> 2016-06-23 09:25:01 +0200
committer: GitHub <noreply@github.com> 2016-06-23 09:25:01 +0200
commit: 49e2854d5c15bbce3f24f91da34450e8f209295b (patch)
tree: f5aa95445549cc151e86f144b40464eecee28cf7 /src/Wallabag/UserBundle
parent: 4eaaa27bb5b9a5725b26471a39548d764fc9cd0a (diff)
parent: 496cfdc0172fd55cb555f74b64704c8f50c71b77 (diff)
download: wallabag-49e2854d5c15bbce3f24f91da34450e8f209295b.tar.gz
wallabag-49e2854d5c15bbce3f24f91da34450e8f209295b.tar.zst
wallabag-49e2854d5c15bbce3f24f91da34450e8f209295b.zip
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>
author	Nicolas Lœuillet <nicolas@loeuillet.org>	2016-06-23 09:25:01 +0200
committer	GitHub <noreply@github.com>	2016-06-23 09:25:01 +0200
commit	49e2854d5c15bbce3f24f91da34450e8f209295b (patch)
tree	f5aa95445549cc151e86f144b40464eecee28cf7 /src/Wallabag/UserBundle
parent	4eaaa27bb5b9a5725b26471a39548d764fc9cd0a (diff)
parent	496cfdc0172fd55cb555f74b64704c8f50c71b77 (diff)
download	wallabag-49e2854d5c15bbce3f24f91da34450e8f209295b.tar.gz wallabag-49e2854d5c15bbce3f24f91da34450e8f209295b.tar.zst wallabag-49e2854d5c15bbce3f24f91da34450e8f209295b.zip

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 @@
23	</div>	23	</div>
24	</div>	24	</div>
25	<div class="card-action center">	25	<div class="card-action center">
26	<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>	26	<a href="{{ path('fos_user_security_logout') }}" class="waves-effect waves-light grey btn">{{ 'security.login.cancel'\|trans }}</a>
27	<button class="btn waves-effect waves-light" type="submit" name="send">	27	<button class="btn waves-effect waves-light" type="submit" name="send">
28	{{ "scheb_two_factor.login"\|trans }}	28	{{ "scheb_two_factor.login"\|trans }}
29	<i class="mdi-content-send right"></i>	29	<i class="material-icons right">send</i>
30	</button>	30	</button>
31	</div>	31	</div>
32	</form>	32	</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 @@
11	{% endif %}	11	{% endif %}
12	</div>	12	</div>
13	<div class="card-action center">	13	<div class="card-action center">
14	<a href="{{ path('homepage') }}" class="waves-effect waves-light btn"><i class="material-icons left"></i> {{ 'security.register.go_to_account'\|trans({},'messages') }}</a>	14	<a href="{{ path('homepage') }}" class="waves-effect waves-light btn">{{ 'security.register.go_to_account'\|trans({},'messages') }}</a>
15	</div>	15	</div>
16	</div>	16	</div>
17	{% endblock fos_user_content %}	17	{% 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 @@
36	</div>	36	</div>
37	</div>	37	</div>
38	<div class="card-action center">	38	<div class="card-action center">
39	<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>	39	<a href="{{ path('fos_user_security_login') }}" class="waves-effect waves-light grey btn">{{ 'security.login.submit'\|trans }}</a>
40	<button class="btn waves-effect waves-light" type="submit" name="send">	40	<button class="btn waves-effect waves-light" type="submit" name="send">
41	{{ 'registration.submit'\|trans({}, 'FOSUserBundle') }}	41	{{ 'registration.submit'\|trans({}, 'FOSUserBundle') }}
42	<i class="mdi-content-send right"></i>	42	<i class="material-icons right">send</i>
43	</button>	43	</button>
44	</div>	44	</div>
45	</form>	45	</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 @@
21	</div>	21	</div>
22	<div class="card-action center">	22	<div class="card-action center">
23	<a href="{{ path('fos_user_security_login') }}" class="waves-effect waves-light grey btn">	23	<a href="{{ path('fos_user_security_login') }}" class="waves-effect waves-light grey btn">
24	<i class="material-icons left"></i> {{ 'security.login.submit'\|trans({}, "messages") }}	24	{{ 'security.login.submit'\|trans({}, "messages") }}
25	</a>	25	</a>
26	<button class="btn waves-effect waves-light" type="submit" name="send">	26	<button class="btn waves-effect waves-light" type="submit" name="send">
27	{{ 'resetting.request.submit'\|trans }}	27	{{ '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 @@
8	<div class="card-action center">	8	<div class="card-action center">
9	<button class="btn waves-effect waves-light" type="submit" name="send">	9	<button class="btn waves-effect waves-light" type="submit" name="send">
10	{{ 'resetting.reset.submit'\|trans }}	10	{{ 'resetting.reset.submit'\|trans }}
11	<i class="mdi-content-send right"></i>	11	<i class="material-icons right">send</i>
12	</button>	12	</button>
13	</div>	13	</div>
14	</div>	14	</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 @@
33	</div>	33	</div>
34	<div class="card-action center">	34	<div class="card-action center">
35	<input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />	35	<input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
36	<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>	36	<a href="{{ path('fos_user_registration_register') }}" class="waves-effect waves-light grey btn">{{ 'security.login.register'\|trans }}</a>
37	<button class="btn waves-effect waves-light" type="submit" name="send">	37	<button class="btn waves-effect waves-light" type="submit" name="send">
38	{{ 'security.login.submit'\|trans }}	38	{{ 'security.login.submit'\|trans }}
39	<i class="mdi-content-send right"></i>	39	<i class="material-icons right">send</i>
40	</button>	40	</button>
41	</div>	41	</div>
42	<div class="center">	42	<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 @@
11	<main class="valign-wrapper">	11	<main class="valign-wrapper">
12	<div class="valign row">	12	<div class="valign row">
13	<div class="card sw">	13	<div class="card sw">
14	<div class="center"><img src="{{ asset('bundles/wallabagcore/themes/material/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>	14	<div class="center"><img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
15	{% block fos_user_content %}	15	{% block fos_user_content %}
16	{% endblock fos_user_content %}	16	{% endblock fos_user_content %}
17	</div>	17	</div>