oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-21 18:11:10 +00:00
Code Wiki Activity

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

Browse source 
fix #1371 config screen: display bug in RSS tab
This commit is contained in:
Nicolas Lœuillet 2015-08-23 13:17:21 +02:00
commit bccb5bba75
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
View file

@ -63,13 +63,15 @@
<div class="row"> <div class="row">
<div class="input-field col s12"> <div class="input-field col s12">
<label>Rss token</label> <label>Rss token</label>
{% if rss.token %} <div>
{{ rss.token }} {% if rss.token %}
{% else %} {{ rss.token }}
<em>No token</em> {% else %}
{% endif %} <em>No token</em>
– {% endif %}
<a href="{{ path('generate_token') }}">Regenerate ?</a> –
<a href="{{ path('generate_token') }}">Regenerate ?</a>
</div>
</div> </div>
</div> </div>

19
src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
View file

@ -4,13 +4,11 @@
0 = Common 0 = Common
1 = Nav 1 = Nav
2 = Side-nav 2 = Side-nav
3 = Filters slider
2 = Layout 4 = Cards
3 = Pictos
4 = Messages
5 = Article 5 = Article
6 = Media queries 6 = Media queries
7 = Others
========================================================================== */ ========================================================================== */
@ -212,7 +210,7 @@ nav input {
} }
/* ========================================================================== /* ==========================================================================
3 = Cards 4 = Cards
========================================================================== */ ========================================================================== */
main #content { main #content {
@ -261,7 +259,7 @@ main ul.row {
} }
/* ========================================================================== /* ==========================================================================
4 = Article 5 = Article
========================================================================== */ ========================================================================== */
#article { #article {
@ -365,3 +363,10 @@ main ul.row {
display: none; display: none;
} }
} }
/* ==========================================================================
7 = Others
========================================================================== */
div.input-field div, div.input-field ul {
margin-top: 40px;
}