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

v2 – 1st draft for Pocket import via API & Wallabag v1 import

diff --combined src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index 7396557148a894df062d075abdae8df1ddd5e04a,516f6fdf07dd3272fef3a0605ee4c3a7b32b7bf1..0ce334a319212ac0a1a8e12b6547cd36c161d5ed
--- 1/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
--- 2/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;
+ }