pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #1493 from wallabag/v2-pocket-import

Browse Source 
v2 – 1st draft for Pocket import via API & Wallabag v1 import
This commit is contained in:
Jeremy Benoist
2016-01-07 22:15:08 +01:00
parent 488a468e3e b88cf91fc8
commit 39643c6b76
51 changed files with 1770 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
View File

@ -45,6 +45,7 @@
<li class="bold border-bottom {% if currentRoute == 'all' %}active{% endif %}"><a class="waves-effect" href="{{ path('all') }}">{% trans %}all{% endtrans %}</a></li>
<li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li>
<li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
<li class="bold {% if currentRoute == 'import' %}active{% endif %}"><a class="waves-effect" href="{{ path('import') }}">{% trans %}import{% endtrans %}</a></li>
<li class="bold {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li>
<li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('fos_user_security_logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
</ul>

6
src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
View File

@ -500,4 +500,8 @@ footer [class^="icon-"]:hover, footer [class*=" icon-"]:hover {
/* force height on non-input field in the settings page */
div.settings div.input-field div, div.settings div.input-field ul {
margin-top: 40px;
}
}
/* but avoid to kill all file input */
div.settings div.file-field div {
margin-top: inherit;
}