From: Jeremy Benoist Date: Thu, 7 Jan 2016 21:15:08 +0000 (+0100) Subject: Merge pull request #1493 from wallabag/v2-pocket-import X-Git-Tag: 2.0.0-alpha.1 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=39643c6b76d92d509b1af0228b6379d7fdce8a1c;hp=-c;p=github%2Fwallabag%2Fwallabag.git Merge pull request #1493 from wallabag/v2-pocket-import v2 – 1st draft for Pocket import via API & Wallabag v1 import --- 39643c6b76d92d509b1af0228b6379d7fdce8a1c diff --combined src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css index 73965571,516f6fdf..0ce334a3 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css @@@ -200,9 -200,6 +200,9 @@@ nav input #button_filters { display: none; } +#button_export { + display: none; +} /* ========================================================================== 2 = Side-nav @@@ -500,4 -497,8 +500,8 @@@ footer [class^="icon-"]:hover, footer [ /* 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; + }