7 files changed, 7 insertions, 125 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 152c5c28..c94c0044 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -45,7 +45,7 @@
                <script src="{{ asset('themes/_global/js/bookmarklet.js') }}"></script>
            {% endblock %}
-            <title>{% block title %}{% endblock %} - wallabag</title>
+            <title>{% block title %}{% endblock %}</title>
        {% endblock %}
    </head>
@@ -60,7 +60,7 @@
                {% block messages %}{% endblock %}
-                <div id="content" class="w600p">
+                <div id="content">
                    {% block content %}{% endblock %}
                </div>
            </main>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig
deleted file mode 100644
index 056d65b5..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %}
-{% block body_class %}login{% endblock %}
-{% block menu %}{% endblock %}
-{% block content %}
-    <form>
-        <fieldset class="w500p center">
-            <h2 class="mbs txtcenter">{% trans %}Forgot password{% endtrans %}</h2>
-            <p>{{ 'An email has been sent to %email%. It contains a link you must click to reset your password.'|trans({'%email%': email}) }}</p>
-        </fieldset>
-    </form>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig
deleted file mode 100644
index 4476ea7b..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %}
-{% block body_class %}login{% endblock %}
-{% block menu %}{% endblock %}
-{% block content %}
-        <form action="{{ path('forgot_password') }}" method="post" name="forgotPasswordform">
-            <fieldset class="w500p center">
-                <h2 class="mbs txtcenter">{% trans %}Forgot password{% endtrans %}</h2>
-                {{ form_errors(form) }}
-                <p>Enter your email address below and we'll send you password reset instructions.</p>
-                <div class="row">
-                    {{ form_label(form.email) }}
-                    {{ form_errors(form.email) }}
-                    {{ form_widget(form.email) }}
-                </div>
-                <div class="row mts txtcenter">
-                    <button type="submit">Send me reset instructions</button>
-                </div>
-            </fieldset>
-            {{ form_rest(form) }}
-        </form>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig
deleted file mode 100644
index 9a59dfc6..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig
+++ /dev/null
@@ -1,40 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-{% block title %}{% trans %}login to your wallabag{% endtrans %}{% endblock %}
-{% block body_class %}login{% endblock %}
-{% block menu %}{% endblock %}
-{% block messages %}{% endblock %}
-{% block content %}
-        <form action="{{ path('login_check') }}" method="post" name="loginform">
-            <fieldset class="w500p center">
-                <h2 class="mbs txtcenter">{% trans %}Login to wallabag{% endtrans %}</h2>
-                {% if error %}
-                    <div>{{ error.message }}</div>
-                {% endif %}
-                {% for flashMessage in app.session.flashbag.get('notice') %}
-                    <p>{{ flashMessage }}</p>
-                {% endfor %}
-                <div class="row">
-                    <label class="col w150p" for="username">{% trans %}Username{% endtrans %}</label>
-                    <input type="text" id="username" name="_username" value="{{ last_username }}" />
-                </div>
-                <div class="row">
-                    <label class="col w150p" for="password">{% trans %}Password{% endtrans %}</label>
-                    <input type="password" id="password" name="_password" />
-                </div>
-                <div class="row mts txtcenter">
-                    <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
-                    <button type="submit">Login</button>
-                    <a href="{{ path('fos_user_registration_register') }}" class="button">{% trans %}Register{% endtrans %}</a>
-                    <a href="{{ path('forgot_password') }}" class="small">Forgot your password?</a>
-                </div>
-            </fieldset>
-        </form>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig
deleted file mode 100644
index fda88af2..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-{% block title %}{% trans %}Change password{% endtrans %}{% endblock %}
-{% block body_class %}login{% endblock %}
-{% block menu %}{% endblock %}
-{% block content %}
-        <form action="{{ path('forgot_password_reset', {'token': token}) }}" method="post" name="loginform">
-            <fieldset class="w500p center">
-                <h2 class="mbs txtcenter">{% trans %}Change password{% endtrans %}</h2>
-                {{ form_errors(form) }}
-                <div class="row">
-                    {{ form_label(form.new_password.first) }}
-                    {{ form_errors(form.new_password.first) }}
-                    {{ form_widget(form.new_password.first) }}
-                </div>
-                <div class="row">
-                    {{ form_label(form.new_password.second) }}
-                    {{ form_errors(form.new_password.second) }}
-                    {{ form_widget(form.new_password.second) }}
-                </div>
-                <div class="row mts txtcenter">
-                    <button type="submit">Change password</button>
-                </div>
-            </fieldset>
-            {{ form_rest(form) }}
-        </form>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index 7a4e7df2..eb33f042 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -250,9 +250,14 @@ main ul.row {
 }
 .card .card-action a {
+    color: #ffffff;
    margin: 0;
 }
+.card .card-action a:hover {
+    color: #ffffff;
+}
 .settings .div_tabs {
    padding-bottom: 15px;
 }
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png
index 32543a44..c90aa46f 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png
Binary files differ

diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index 152c5c28..c94c0044 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -45,7 +45,7 @@
45	<script src="{{ asset('themes/_global/js/bookmarklet.js') }}"></script>	45	<script src="{{ asset('themes/_global/js/bookmarklet.js') }}"></script>
46	{% endblock %}	46	{% endblock %}
47		47
48	<title>{% block title %}{% endblock %} - wallabag</title>	48	<title>{% block title %}{% endblock %}</title>
49	{% endblock %}	49	{% endblock %}
50	</head>	50	</head>
51		51
@@ -60,7 +60,7 @@
60		60
61	{% block messages %}{% endblock %}	61	{% block messages %}{% endblock %}
62		62
63	<div id="content" class="w600p">	63	<div id="content">
64	{% block content %}{% endblock %}	64	{% block content %}{% endblock %}
65	</div>	65	</div>
66	</main>	66	</main>


diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig deleted file mode 100644 index 056d65b5..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig +++ /dev/null
@@ -1,17 +0,0 @@
1	{% extends "WallabagCoreBundle::layout.html.twig" %}
2
3	{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %}
4
5	{% block body_class %}login{% endblock %}
6
7	{% block menu %}{% endblock %}
8
9	{% block content %}
10	<form>
11	<fieldset class="w500p center">
12	<h2 class="mbs txtcenter">{% trans %}Forgot password{% endtrans %}</h2>
13
14	<p>{{ 'An email has been sent to %email%. It contains a link you must click to reset your password.'\|trans({'%email%': email}) }}</p>
15	</fieldset>
16	</form>
17	{% endblock %}


diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig deleted file mode 100644 index 4476ea7b..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig +++ /dev/null
@@ -1,31 +0,0 @@
1	{% extends "WallabagCoreBundle::layout.html.twig" %}
2
3	{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %}
4
5	{% block body_class %}login{% endblock %}
6
7	{% block menu %}{% endblock %}
8
9	{% block content %}
10	<form action="{{ path('forgot_password') }}" method="post" name="forgotPasswordform">
11	<fieldset class="w500p center">
12	<h2 class="mbs txtcenter">{% trans %}Forgot password{% endtrans %}</h2>
13
14	{{ form_errors(form) }}
15
16	<p>Enter your email address below and we'll send you password reset instructions.</p>
17
18	<div class="row">
19	{{ form_label(form.email) }}
20	{{ form_errors(form.email) }}
21	{{ form_widget(form.email) }}
22	</div>
23
24	<div class="row mts txtcenter">
25	<button type="submit">Send me reset instructions</button>
26	</div>
27	</fieldset>
28
29	{{ form_rest(form) }}
30	</form>
31	{% endblock %}


diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig deleted file mode 100644 index 9a59dfc6..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig +++ /dev/null
@@ -1,40 +0,0 @@
1	{% extends "WallabagCoreBundle::layout.html.twig" %}
2
3	{% block title %}{% trans %}login to your wallabag{% endtrans %}{% endblock %}
4
5	{% block body_class %}login{% endblock %}
6
7	{% block menu %}{% endblock %}
8	{% block messages %}{% endblock %}
9
10	{% block content %}
11	<form action="{{ path('login_check') }}" method="post" name="loginform">
12	<fieldset class="w500p center">
13	<h2 class="mbs txtcenter">{% trans %}Login to wallabag{% endtrans %}</h2>
14	{% if error %}
15	<div>{{ error.message }}</div>
16	{% endif %}
17
18	{% for flashMessage in app.session.flashbag.get('notice') %}
19	<p>{{ flashMessage }}</p>
20	{% endfor %}
21
22	<div class="row">
23	<label class="col w150p" for="username">{% trans %}Username{% endtrans %}</label>
24	<input type="text" id="username" name="_username" value="{{ last_username }}" />
25	</div>
26
27	<div class="row">
28	<label class="col w150p" for="password">{% trans %}Password{% endtrans %}</label>
29	<input type="password" id="password" name="_password" />
30	</div>
31
32	<div class="row mts txtcenter">
33	<input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
34	<button type="submit">Login</button>
35	<a href="{{ path('fos_user_registration_register') }}" class="button">{% trans %}Register{% endtrans %}</a>
36	<a href="{{ path('forgot_password') }}" class="small">Forgot your password?</a>
37	</div>
38	</fieldset>
39	</form>
40	{% endblock %}


diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig deleted file mode 100644 index fda88af2..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig +++ /dev/null
@@ -1,35 +0,0 @@
1	{% extends "WallabagCoreBundle::layout.html.twig" %}
2
3	{% block title %}{% trans %}Change password{% endtrans %}{% endblock %}
4
5	{% block body_class %}login{% endblock %}
6
7	{% block menu %}{% endblock %}
8
9	{% block content %}
10	<form action="{{ path('forgot_password_reset', {'token': token}) }}" method="post" name="loginform">
11	<fieldset class="w500p center">
12	<h2 class="mbs txtcenter">{% trans %}Change password{% endtrans %}</h2>
13
14	{{ form_errors(form) }}
15
16	<div class="row">
17	{{ form_label(form.new_password.first) }}
18	{{ form_errors(form.new_password.first) }}
19	{{ form_widget(form.new_password.first) }}
20	</div>
21
22	<div class="row">
23	{{ form_label(form.new_password.second) }}
24	{{ form_errors(form.new_password.second) }}
25	{{ form_widget(form.new_password.second) }}
26	</div>
27
28	<div class="row mts txtcenter">
29	<button type="submit">Change password</button>
30	</div>
31	</fieldset>
32
33	{{ form_rest(form) }}
34	</form>
35	{% endblock %}


diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css index 7a4e7df2..eb33f042 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -250,9 +250,14 @@ main ul.row {
250	}	250	}
251		251
252	.card .card-action a {	252	.card .card-action a {
		253	color: #ffffff;
253	margin: 0;	254	margin: 0;
254	}	255	}
255		256
		257	.card .card-action a:hover {
		258	color: #ffffff;
		259	}
		260
256	.settings .div_tabs {	261	.settings .div_tabs {
257	padding-bottom: 15px;	262	padding-bottom: 15px;
258	}	263	}


diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png index 32543a44..c90aa46f 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png
Binary files differ