Merge pull request #1384 from wallabag/v2-fix-config-display

fix #1371 config screen: display bug in RSS tab

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 287c5fbb41efdb11b2432743ca7c8c35b0c667c2..3ec31a02ca202606a27b64eccc26303351ea0692 100644 (file)
--- 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 52a2be809bab7a2d8054a8bcb32c17e38eecf42f..a976da100f65b1140548593941d1326ff8afd39a 100755 (executable)
--- 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;
+}