Merge pull request #1279 from wallabag/material-default

set material to default theme \o/

diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index f80f65ad87136fbd85e96084302c6ac9bc52623b..97933ec33a82729ce93281ecfddbf4d99cbadb29 100644 (file)
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -40,7 +40,7 @@ parameters:
 
     # default user config
     items_on_page: 12
-    theme: baggy
+    theme: material
     language: en_US
     from_email: no-reply@wallabag.org
     rss_limit: 50

diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php
index 900e151d806afcdbd03b76f2cf505d3ddc369640..3bb5c5f2acbb423dce8c612d470521c083cc9fa7 100644 (file)
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php
@@ -15,7 +15,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
     public function load(ObjectManager $manager)
     {
         $adminConfig = new Config($this->getReference('admin-user'));
-        $adminConfig->setTheme('baggy');
+        $adminConfig->setTheme('material');
         $adminConfig->setItemsPerPage(30);
         $adminConfig->setLanguage('en_US');
 

diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index f72cba6595ed690d064c93e66a3a0429aa5cbb0c..5ab9c3295576ea556ffbfe00c574d65744a34f60 100644 (file)
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
@@ -102,7 +102,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
         return array(
             array(
                 array(
-                    'change_passwd[old_password]' => 'baggy',
+                    'change_passwd[old_password]' => 'material',
                     'change_passwd[new_password][first]' => '',
                     'change_passwd[new_password][second]' => '',
                 ),

diff --git a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
index e560ffdd3d2cdadebcf50bd80cfb5a4460af1d72..a51e836d1586c74659a5145175f59b35dff1a38e 100644 (file)
--- a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
@@ -69,7 +69,7 @@ class SecurityControllerTest extends WallabagCoreTestCase
         $client = $parameters['client'];
 
         $data = array(
-            'forgot_password[email]' => 'baggy',
+            'forgot_password[email]' => 'material',
         );
 
         $client->submit($form, $data);