From 83aaf84195bc7c43a548289761827c76c3ab77ab Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 22 Aug 2015 12:28:56 +0200
Subject: Fix display issue in config rss tab
---
.../views/themes/material/Config/index.html.twig | 16 +++++++++-------
.../views/themes/material/public/css/main.css | 19 ++++++++++++-------
2 files changed, 21 insertions(+), 14 deletions(-)
(limited to 'src/Wallabag')
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 @@
<div class="row">
<div class="input-field col s12">
<label>Rss token</label>
- {% if rss.token %}
- {{ rss.token }}
- {% else %}
- <em>No token</em>
- {% endif %}
- –
- <a href="{{ path('generate_token') }}">Regenerate ?</a>
+ <div>
+ {% if rss.token %}
+ {{ rss.token }}
+ {% else %}
+ <em>No token</em>
+ {% endif %}
+ –
+ <a href="{{ path('generate_token') }}">Regenerate ?</a>
+ </div>
</div>
</div>
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 @@
0 = Common
1 = Nav
2 = Side-nav
-
- 2 = Layout
- 3 = Pictos
- 4 = Messages
+ 3 = Filters slider
+ 4 = Cards
5 = Article
-
6 = Media queries
+ 7 = Others
========================================================================== */
@@ -212,7 +210,7 @@ nav input {
}
/* ==========================================================================
- 3 = Cards
+ 4 = Cards
========================================================================== */
main #content {
@@ -261,7 +259,7 @@ main ul.row {
}
/* ==========================================================================
- 4 = Article
+ 5 = Article
========================================================================== */
#article {
@@ -365,3 +363,10 @@ main ul.row {
display: none;
}
}
+/* ==========================================================================
+ 7 = Others
+ ========================================================================== */
+
+div.input-field div, div.input-field ul {
+ margin-top: 40px;
+}
--
cgit v1.2.3