aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2015-08-22 12:28:56 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2015-08-22 12:30:06 +0200
commit83aaf84195bc7c43a548289761827c76c3ab77ab (patch)
tree658c5502f35903c3ad972834fcbfac978c78902f /src/Wallabag
parent4fcb7eaf139a4d2cbd0f54574e6c51a0fe852ef1 (diff)
downloadwallabag-83aaf84195bc7c43a548289761827c76c3ab77ab.tar.gz
wallabag-83aaf84195bc7c43a548289761827c76c3ab77ab.tar.zst
wallabag-83aaf84195bc7c43a548289761827c76c3ab77ab.zip
Fix display issue in config rss tab
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig16
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css19
2 files changed, 21 insertions, 14 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 287c5fbb..3ec31a02 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -63,13 +63,15 @@
63 <div class="row"> 63 <div class="row">
64 <div class="input-field col s12"> 64 <div class="input-field col s12">
65 <label>Rss token</label> 65 <label>Rss token</label>
66 {% if rss.token %} 66 <div>
67 {{ rss.token }} 67 {% if rss.token %}
68 {% else %} 68 {{ rss.token }}
69 <em>No token</em> 69 {% else %}
70 {% endif %} 70 <em>No token</em>
71 71 {% endif %}
72 <a href="{{ path('generate_token') }}">Regenerate ?</a> 72
73 <a href="{{ path('generate_token') }}">Regenerate ?</a>
74 </div>
73 </div> 75 </div>
74 </div> 76 </div>
75 77
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 52a2be80..a976da10 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
@@ -4,13 +4,11 @@
4 0 = Common 4 0 = Common
5 1 = Nav 5 1 = Nav
6 2 = Side-nav 6 2 = Side-nav
7 7 3 = Filters slider
8 2 = Layout 8 4 = Cards
9 3 = Pictos
10 4 = Messages
11 5 = Article 9 5 = Article
12
13 6 = Media queries 10 6 = Media queries
11 7 = Others
14 12
15 ========================================================================== */ 13 ========================================================================== */
16 14
@@ -212,7 +210,7 @@ nav input {
212} 210}
213 211
214/* ========================================================================== 212/* ==========================================================================
215 3 = Cards 213 4 = Cards
216 ========================================================================== */ 214 ========================================================================== */
217 215
218main #content { 216main #content {
@@ -261,7 +259,7 @@ main ul.row {
261} 259}
262 260
263/* ========================================================================== 261/* ==========================================================================
264 4 = Article 262 5 = Article
265 ========================================================================== */ 263 ========================================================================== */
266 264
267#article { 265#article {
@@ -365,3 +363,10 @@ main ul.row {
365 display: none; 363 display: none;
366 } 364 }
367} 365}
366/* ==========================================================================
367 7 = Others
368 ========================================================================== */
369
370div.input-field div, div.input-field ul {
371 margin-top: 40px;
372}