12 files changed, 30 insertions, 19 deletions

diff --git a/app/AppKernel.php b/app/AppKernel.php
index f1140943..90e9f1d8 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -48,6 +48,7 @@ class AppKernel extends Kernel
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
             $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
             $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
+            $bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
 
             if ('test' === $this->getEnvironment()) {
                 $bundles[] = new DAMA\DoctrineTestBundle\DAMADoctrineTestBundle();
@@ -57,11 +58,6 @@ class AppKernel extends Kernel
         return $bundles;
     }
 
-    public function getRootDir()
-    {
-        return __DIR__;
-    }
-
     public function getCacheDir()
     {
         return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
@@ -74,7 +70,7 @@ class AppKernel extends Kernel
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
+        $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml');
         $loader->load(function ($container) {
             if ($container->getParameter('use_webpack_dev_server')) {
                 $container->loadFromExtension('framework', [
diff --git a/app/Resources/static/themes/_global/share.js b/app/Resources/static/themes/_global/share.js
index d7078616..15206b37 100644
--- a/app/Resources/static/themes/_global/share.js
+++ b/app/Resources/static/themes/_global/share.js
@@ -1 +1,4 @@
 import './share.scss';
+
+function requireAll(r) { r.keys().forEach(r); }
+requireAll(require.context('./img/', true, /\.(jpg|png|gif|svg|ico)$/));
diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss
index 08c2d8ab..36d79a45 100644
--- a/app/Resources/static/themes/material/css/media_queries.scss
+++ b/app/Resources/static/themes/material/css/media_queries.scss
@@ -4,7 +4,7 @@
 
 @media only screen and (min-width: 992px) {
   nav,
-  body:not(.entry) main,
+  body:not(.entry):not(.login) main,
   footer {
     padding-left: 240px;
   }
diff --git a/app/config/config.yml b/app/config/config.yml
index b76fb696..08da4f8f 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -16,7 +16,7 @@ framework:
         fallback: "%locale%"
     secret: "%secret%"
     router:
-        resource: "%kernel.root_dir%/config/routing.yml"
+        resource: "%kernel.project_dir%/app/config/routing.yml"
         strict_requirements: ~
     form: ~
     csrf_protection: ~
@@ -30,7 +30,7 @@ framework:
     session:
         # handler_id set to null will use default session handler from php.ini
         handler_id: session.handler.native_file
-        save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%"
+        save_path: "%kernel.project_dir%/var/sessions/%kernel.environment%"
     fragments: ~
     http_method_override: true
     assets: ~
@@ -72,7 +72,7 @@ stof_doctrine_extensions:
             sluggable: true
 
 doctrine_migrations:
-    dir_name: "%kernel.root_dir%/DoctrineMigrations"
+    dir_name: "%kernel.project_dir%/app/DoctrineMigrations"
     namespace: Application\Migrations
     table_name: migration_versions
     name: Application Migrations
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 3b67d8f6..0c490575 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -3,7 +3,7 @@ imports:
 
 framework:
     router:
-        resource: "%kernel.root_dir%/config/routing_dev.yml"
+        resource: "%kernel.project_dir%/app/config/routing_dev.yml"
         strict_requirements: true
     profiler:
         only_exceptions: false
diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml
index 65b02d66..44e29aac 100644
--- a/app/config/config_prod.yml
+++ b/app/config/config_prod.yml
@@ -3,7 +3,7 @@ imports:
 
 framework:
     assets:
-        # json_manifest_path: '%kernel.root_dir%/../web/bundles/wallabagcore/manifest.json'
+        # json_manifest_path: '%kernel.project_dir%/web/bundles/wallabagcore/manifest.json'
 
 #doctrine:
 #    orm:
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index b3fe11c8..b5b97950 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -16,7 +16,7 @@ parameters:
     database_name: wallabag
     database_user: root
     database_password: ~
-    # For SQLite, database_path should be "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    # For SQLite, database_path should be "%kernel.project_dir%/data/db/wallabag.sqlite"
     database_path: null
     database_table_prefix: wallabag_
     database_socket: null
diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml
index 010785e6..257d2ace 100644
--- a/app/config/parameters_test.yml
+++ b/app/config/parameters_test.yml
@@ -6,5 +6,5 @@ parameters:
     test_database_user: null
     test_database_password: null
     test_database_path: "%env(TEST_DATABASE_PATH)%"
-    env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
+    env(TEST_DATABASE_PATH): "%kernel.project_dir%/data/db/wallabag_test.sqlite"
     test_database_charset: utf8
diff --git a/app/config/tests/parameters_test.sqlite.yml b/app/config/tests/parameters_test.sqlite.yml
index 5c731bf5..2b92d579 100644
--- a/app/config/tests/parameters_test.sqlite.yml
+++ b/app/config/tests/parameters_test.sqlite.yml
@@ -8,5 +8,5 @@ parameters:
     # Using an environnement variable in order to avoid the error "attempt to write a readonly database"
     # when the schema is dropped then recreate
     test_database_path: "%env(TEST_DATABASE_PATH)%"
-    env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
+    env(TEST_DATABASE_PATH): "%kernel.project_dir%/data/db/wallabag_test.sqlite"
     test_database_charset: utf8
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index d70653ce..6b4722fc 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -27,7 +27,7 @@ wallabag_core:
     fetching_error_message: |
         wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
     api_limit_mass_actions: 10
-    encryption_key_path: "%kernel.root_dir%/../data/site-credentials-secret-key.txt"
+    encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt"
     default_internal_settings:
         -
             name: share_public
@@ -159,4 +159,4 @@ wallabag_user:
 
 wallabag_import:
     allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv']
-    resource_dir: "%kernel.root_dir%/../web/uploads/import"
+    resource_dir: "%kernel.project_dir%/web/uploads/import"
diff --git a/app/config/webpack/dev.js b/app/config/webpack/dev.js
index b6551152..97abc5eb 100644
--- a/app/config/webpack/dev.js
+++ b/app/config/webpack/dev.js
@@ -52,7 +52,7 @@ module.exports = function () {
           ],
         },
         {
-          test: /\.(jpg|png|gif|svg|eot|ttf|woff|woff2)$/,
+          test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/,
           use: 'url-loader',
         },
       ],
diff --git a/app/config/webpack/prod.js b/app/config/webpack/prod.js
index 44961cc5..17b8c384 100644
--- a/app/config/webpack/prod.js
+++ b/app/config/webpack/prod.js
@@ -76,7 +76,8 @@ module.exports = function () {
           }),
         },
         {
-          test: /\.(jpg|png|gif|svg)$/,
+          test: /\.(jpg|png|gif|svg|ico)$/,
+          include: /node_modules/,
           use: {
             loader: 'file-loader',
             options: {
@@ -85,6 +86,17 @@ module.exports = function () {
           },
         },
         {
+          test: /\.(jpg|png|gif|svg|ico)$/,
+          exclude: /node_modules/,
+          use: {
+            loader: 'file-loader',
+            options: {
+              context: 'app/Resources/static',
+              name: '[path][name].[ext]',
+            },
+          },
+        },
+        {
           test: /\.(eot|ttf|woff|woff2)$/,
           use: {
             loader: 'file-loader',