aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig44
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig46
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig40
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Security/checkEmail.html.twig27
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig56
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig58
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Security/reset.html.twig57
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig13
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css29
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js4
11 files changed, 353 insertions, 23 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
new file mode 100644
index 00000000..c002c4c3
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
@@ -0,0 +1,44 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %}
2
3{% block title %}{% trans %}Edit an entry{% endtrans %}{% endblock %}
4
5{% block content %}
6
7 <div class="row">
8 <div class="col s12">
9 <div class="card-panel">
10
11 <form name="entry" method="post" action="">
12 <div class="card-content">
13
14 {% if form_errors(form) %}
15 <span class="black-text">{{ form_errors(form) }}</span>
16 {% endif %}
17
18 {% if form_errors(form.title) %}
19 <span class="black-text">{{ form_errors(form.title) }}</span>
20 {% endif %}
21
22 <div class="input-field s12">
23 {{ form_label(form.title) }}
24 {{ form_widget(form.title) }}
25 </div>
26
27 <div class="input-field s12">
28 {{ form_widget(form.is_public) }}
29 {{ form_label(form.is_public) }}
30 </div>
31 <br>
32 <button class="btn waves-effect waves-light" type="submit" name="entry[save]">
33 {% trans %}Save{% endtrans %}
34 <i class="mdi-content-send right"></i>
35 </button>
36 </div>
37 <div class="hidden">{{ form_rest(form) }}</div>
38 </form>
39
40 </div>
41 </div>
42 </div>
43
44{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index a2202431..fbdc1ffd 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -32,7 +32,7 @@
32 {% if entries is empty %} 32 {% if entries is empty %}
33 <div class="messages warning"><p>{% trans %}No articles found.{% endtrans %}</p></div> 33 <div class="messages warning"><p>{% trans %}No articles found.{% endtrans %}</p></div>
34 {% else %} 34 {% else %}
35 <ul class="row"> 35 <ul class="row data">
36 {% for entry in entries %} 36 {% for entry in entries %}
37 <li id="entry-{{ entry.id|e }}" class="col l4 m6 s12"> 37 <li id="entry-{{ entry.id|e }}" class="col l4 m6 s12">
38 <div class="card"> 38 <div class="card">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index 3e161745..5d098232 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -3,8 +3,36 @@
3{% block title %}{{ entry.title|raw }} ({{ entry.url | e | domainName }}){% endblock %} 3{% block title %}{{ entry.title|raw }} ({{ entry.url | e | domainName }}){% endblock %}
4 4
5{% block menu %} 5{% block menu %}
6 <nav class="hide-on-large-only">
7 <div class="nav-wrapper cyan darken-1">
8 <ul>
9 <li>
10 <a class="waves-effect" href="/">
11 <i class="mdi-action-exit-to-app"></i>
12 </a>
13 </li>
14 </ul>
15 <ul class="right">
16 <li>
17 <a class="waves-effect" title="{% trans %}Mark as read{% endtrans %}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
18 <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i>
19 </a>
20 </li>
21 <li>
22 <a class="waves-effect" title="{% trans %}Favorite{% endtrans %}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
23 <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i>
24 </a>
25 </li>
26 <li>
27 <a href="#" data-activates="slide-out" class="button-collapse right">
28 <i class="mdi-navigation-menu"></i>
29 </a>
30 </li>
31 </ul>
32 </div>
33 </nav>
6 <ul id="slide-out" class="collapsible side-nav fixed reader-mode" data-collapsible="accordion"> 34 <ul id="slide-out" class="collapsible side-nav fixed reader-mode" data-collapsible="accordion">
7 <li class="bold border-bottom"> 35 <li class="bold border-bottom hide-on-med-and-down">
8 <a class="waves-effect collapsible-header" href="/"> 36 <a class="waves-effect collapsible-header" href="/">
9 <i class="mdi-action-exit-to-app small"></i> 37 <i class="mdi-action-exit-to-app small"></i>
10 <span>{% trans %}back{% endtrans %}</span> 38 <span>{% trans %}back{% endtrans %}</span>
@@ -12,7 +40,7 @@
12 <div class="collapsible-body"></div> 40 <div class="collapsible-body"></div>
13 </li> 41 </li>
14 42
15 <li class="bold"> 43 <li class="bold hide-on-med-and-down">
16 <a class="waves-effect collapsible-header" title="{% trans %}Mark as read{% endtrans %}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> 44 <a class="waves-effect collapsible-header" title="{% trans %}Mark as read{% endtrans %}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
17 <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i> 45 <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i>
18 <span>{% trans %}Toggle mark as read{% endtrans %}</span> 46 <span>{% trans %}Toggle mark as read{% endtrans %}</span>
@@ -20,14 +48,14 @@
20 <div class="collapsible-body"></div> 48 <div class="collapsible-body"></div>
21 </li> 49 </li>
22 50
23 <li class="bold"> 51 <li class="bold hide-on-med-and-down">
24 <a class="waves-effect collapsible-header" title="{% trans %}Favorite{% endtrans %}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> 52 <a class="waves-effect collapsible-header" title="{% trans %}Favorite{% endtrans %}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
25 <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> 53 <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i>
26 <span>{% trans %}Toggle favorite{% endtrans %}</span> 54 <span>{% trans %}Toggle favorite{% endtrans %}</span>
27 </a> 55 </a>
28 <div class="collapsible-body"></div> 56 <div class="collapsible-body"></div>
29 </li> 57 </li>
30 <li class="bold border-bottom"> 58 <li class="bold border-bottom hide-on-med-and-down">
31 <a class="waves-effect collapsible-header" title="{% trans %}Delete{% endtrans %}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> 59 <a class="waves-effect collapsible-header" title="{% trans %}Delete{% endtrans %}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
32 <i class="mdi-action-delete small"></i> 60 <i class="mdi-action-delete small"></i>
33 <span>{% trans %}Delete{% endtrans %}</span> 61 <span>{% trans %}Delete{% endtrans %}</span>
@@ -66,6 +94,14 @@
66 </div> 94 </div>
67 </li> 95 </li>
68 96
97 <li class="bold hide-on-large-only">
98 <a class="waves-effect collapsible-header" title="{% trans %}Delete{% endtrans %}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
99 <i class="mdi-action-delete small"></i>
100 <span>{% trans %}Delete{% endtrans %}</span>
101 </a>
102 <div class="collapsible-body"></div>
103 </li>
104
69 <li class="bold"> 105 <li class="bold">
70 <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans %}Does this article appear wrong?{% endtrans %}"> 106 <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans %}Does this article appear wrong?{% endtrans %}">
71 <i class="mdi-alert-error small"></i> 107 <i class="mdi-alert-error small"></i>
@@ -86,7 +122,7 @@ main {
86{% block content %} 122{% block content %}
87 <div id="article"> 123 <div id="article">
88 <header class="mbm"> 124 <header class="mbm">
89 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit tags{% endtrans %}">✎</a></h1> 125 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit title{% endtrans %}">✎</a></h1>
90 <a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link"><span>{{ entry.url | e | domainName }}</span></a> 126 <a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link"><span>{{ entry.url | e | domainName }}</span></a>
91 </header> 127 </header>
92 <aside class="tags"> 128 <aside class="tags">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig
new file mode 100644
index 00000000..cac9a96b
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig
@@ -0,0 +1,40 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %}
2
3{% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %}
4
5{% block content %}
6 <div class="row">
7 <div class="col s12">
8 <div class="card-panel">
9
10 <form name="entry" method="post" action="">
11 <div class="card-content">
12
13 {% if form_errors(form) %}
14 <span class="black-text">{{ form_errors(form) }}</span>
15 {% endif %}
16
17 {% if form_errors(form.url) %}
18 <span class="black-text">{{ form_errors(form.url) }}</span>
19 {% endif %}
20
21 <div class="input-field s12">
22 {{ form_label(form.url) }}
23 {{ form_widget(form.url) }}
24 </div>
25
26 <button class="btn waves-effect waves-light" type="submit" name="entry[save]">
27 {% trans %}Save{% endtrans %}
28 <i class="mdi-content-send right"></i>
29 </button>
30 </div>
31 <div class="hidden">{{ form_rest(form) }}</div>
32 </form>
33
34
35 {{ form(form) }}
36
37 </div>
38 </div>
39 </div>
40{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/checkEmail.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/checkEmail.html.twig
new file mode 100644
index 00000000..8f698e17
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/checkEmail.html.twig
@@ -0,0 +1,27 @@
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 <main class="valign-wrapper">
11 <div class="valign row">
12 <h1>{% trans %}Forgot password{% endtrans %}</h1>
13 <div class="card sw">
14 <div class="card-content">
15 <span class="card-title black-text">
16 <p>{{ 'An email has been sent to %email%. It contains a link you must click to reset your password.'|trans({'%email%': email}) }}</p>
17 </span>
18 </div>
19 </div>
20 </div>
21 </main>
22 <style>
23 main {
24 padding: 0;
25 }
26 </style>
27{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig
new file mode 100644
index 00000000..7d7fea6f
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig
@@ -0,0 +1,56 @@
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 <main class="valign-wrapper">
11 <div class="valign row">
12 <h1>{% trans %}Forgot password{% endtrans %}</h1>
13 <div class="card sw">
14 <form action="{{ path('forgot_password') }}" method="post" name="forgotPasswordform">
15 <div class="card-content">
16
17 <span class="card-title black-text"><p>{% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %}</p></span>
18
19 {% if form_errors(form) %}
20 <span class="black-text">{{ form_errors(form) }}</span>
21 {% endif %}
22
23 {% for flashMessage in app.session.flashbag.get('notice') %}
24 <span class="black-text"><p>{{ flashMessage }}</p></span>
25 {% endfor %}
26
27 {% if form_errors(form.email) %}
28 <span class="black-text">{{ form_errors(form.email) }}</span>
29 {% endif %}
30
31 <div class="input-field s12">
32 {{ form_label(form.email) }}
33 {{ form_widget(form.email) }}
34 </div>
35
36 </div>
37 <div class="card-action">
38 <button class="btn waves-effect waves-light" type="submit" name="send">
39 {% trans %}Send{% endtrans %}
40 <i class="mdi-content-send right"></i>
41 </button>
42 </div>
43 {{ form_rest(form) }}
44 </form>
45 </div>
46 </div>
47 </main>
48 <style>
49 main {
50 padding: 0;
51 }
52 </style>
53{% endblock %}
54
55{% block footer %}
56{% endblock %} \ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
new file mode 100644
index 00000000..8f60fbe2
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
@@ -0,0 +1,58 @@
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 <main class="valign-wrapper">
12 <div class="valign row">
13 <h1>{% trans %}Login to wallabag{% endtrans %}</h1>
14 <div class="card sw">
15 <form action="{{ path('login_check') }}" method="post" name="loginform">
16 <div class="card-content">
17
18 {% if error %}
19 <span class="black-text">{{ error.message }}</span>
20 {% endif %}
21
22 {% for flashMessage in app.session.flashbag.get('notice') %}
23 <span class="black-text"><p>{{ flashMessage }}</p></span>
24 {% endfor %}
25
26 <div class="input-field s12">
27 <label for="username">{% trans %}Username{% endtrans %}</label>
28 <input type="text" id="username" name="_username" value="{{ last_username }}" />
29 </div>
30
31 <div class="input-field s12">
32 <label for="password">{% trans %}Password{% endtrans %}</label>
33 <input type="password" id="password" name="_password" />
34 </div>
35
36 </div>
37 <div class="card-action">
38 <button class="btn waves-effect waves-light" type="submit" name="send">
39 {% trans %}Login{% endtrans %}
40 <i class="mdi-content-send right"></i>
41 </button>
42 </div>
43 </form>
44 </div>
45 <div class="center">
46 <a href="{{ path('forgot_password') }}">{% trans %}Forgot your password?{% endtrans %}</a>
47 </div>
48 </div>
49 </main>
50 <style>
51 main {
52 padding: 0;
53 }
54 </style>
55{% endblock %}
56
57{% block footer %}
58{% endblock %} \ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/reset.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/reset.html.twig
new file mode 100644
index 00000000..09d0b634
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/reset.html.twig
@@ -0,0 +1,57 @@
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 <main class="valign-wrapper">
11 <div class="valign row">
12 <div class="card sw">
13 <form action="{{ path('forgot_password_reset', {'token': token}) }}" method="post" name="loginform">
14 <div class="card-content">
15
16 <span class="card-title black-text"><p>{% trans %}Change password{% endtrans %}</p></span>
17
18 {% if form_errors(form) %}
19 <span class="black-text">{{ form_errors(form) }}</span>
20 {% endif %}
21
22 {% if form_errors(form.new_password.first) %}
23 <span class="black-text">{{ form_errors(form.new_password.first) }}</span>
24 {% endif %}
25
26 {% if form_errors(form.new_password.second) %}
27 <span class="black-text">{{ form_errors(form.new_password.second) }}</span>
28 {% endif %}
29
30 <div class="input-field s12">
31 {{ form_label(form.new_password.first) }}
32 {{ form_widget(form.new_password.first) }}
33 </div>
34
35 <div class="input-field s12">
36 {{ form_label(form.new_password.second) }}
37 {{ form_widget(form.new_password.second) }}
38 </div>
39
40 </div>
41 <div class="card-action">
42 <button class="btn waves-effect waves-light" type="submit" name="send">
43 {% trans %}Change password{% endtrans %}
44 <i class="mdi-content-send right"></i>
45 </button>
46 </div>
47 {{ form_rest(form) }}
48 </form>
49 </div>
50 </div>
51 </main>
52 <style>
53 main {
54 padding: 0;
55 }
56 </style>
57{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
index 247c871e..0c8a2a29 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
@@ -68,11 +68,14 @@
68 </a> 68 </a>
69 </li> 69 </li>
70 {% endblock %} 70 {% endblock %}
71 <li class="bold"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> 71
72 <li class="bold"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li> 72 {% set currentRoute = app.request.attributes.get('_route') %}
73 <li class="bold"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li> 73
74 <li class="bold border-bottom"><a class="waves-effect" href="?view=tags">{% trans %}tags{% endtrans %}</a></li> 74 <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
75 <li class="bold"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li> 75 <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
76 <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
77 <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
78 <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
76 <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> 79 <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
77 </ul> 80 </ul>
78 <div class="nav-wrapper nav-panels"> 81 <div class="nav-wrapper nav-panels">
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 49549edc..8ec83f89 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
@@ -128,7 +128,7 @@ main ul.row {
128 padding: 0px 0.75rem; 128 padding: 0px 0.75rem;
129} 129}
130 130
131main .card .card-content { 131.data .card .card-content {
132 min-height: 25em; 132 min-height: 25em;
133} 133}
134 134
@@ -158,6 +158,12 @@ main .card .card-content {
158 padding-bottom: 15px; 158 padding-bottom: 15px;
159} 159}
160 160
161.card.sw {
162 max-width: 370px;
163 margin-left: auto;
164 margin-right: auto;
165}
166
161/* ========================================================================== 167/* ==========================================================================
162 4 = Article 168 4 = Article
163 ========================================================================== */ 169 ========================================================================== */
@@ -194,6 +200,18 @@ main .card .card-content {
194 header, main, footer { 200 header, main, footer {
195 padding-left: 0; 201 padding-left: 0;
196 } 202 }
203 nav, main, footer {
204 padding-left: 0;
205 }
206 .pagination {
207 width: auto;
208 }
209 .reader-mode {
210 width: 240px !important;
211 }
212 .reader-mode span {
213 opacity: 1;
214 }
197 } 215 }
198 216
199@media only screen and (min-width : 993px) and (max-width : 1180px) { 217@media only screen and (min-width : 993px) and (max-width : 1180px) {
@@ -229,15 +247,6 @@ main .card .card-content {
229 margin-left: 0; } 247 margin-left: 0; }
230} 248}
231 249
232@media only screen and (max-width : 993px) {
233 nav, main, footer {
234 padding-left: 0;
235 }
236 .pagination {
237 width: auto;
238 }
239}
240
241@media only screen and (max-width : 350px) { 250@media only screen and (max-width : 350px) {
242 .nb-results { 251 .nb-results {
243 display: none; 252 display: none;
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
index 9847658e..b0f82c4b 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
@@ -15,14 +15,14 @@ $(document).ready(function(){
15 $('#nav-btn-search').click(function(){ 15 $('#nav-btn-search').click(function(){
16 $(".nav-panel-buttom").hide(100); 16 $(".nav-panel-buttom").hide(100);
17 $(".nav-panel-search").show(100); 17 $(".nav-panel-search").show(100);
18 $(".nav-panel-menu").hide(100); 18 $(".nav-panel-menu").addClass('hidden');
19 return false; 19 return false;
20 }); 20 });
21 $('.mdi-navigation-close').click(function(){ 21 $('.mdi-navigation-close').click(function(){
22 $(".nav-panel-add").hide(100); 22 $(".nav-panel-add").hide(100);
23 $(".nav-panel-search").hide(100); 23 $(".nav-panel-search").hide(100);
24 $(".nav-panel-buttom").show(100); 24 $(".nav-panel-buttom").show(100);
25 $(".nav-panel-menu").show(100); 25 $(".nav-panel-menu").removeClass('hidden');
26 return false; 26 return false;
27 }); 27 });
28}); \ No newline at end of file 28}); \ No newline at end of file