From: Nicolas LÅ“uillet Date: Tue, 4 Aug 2015 20:51:21 +0000 (+0200) Subject: set material to default theme \o/ X-Git-Tag: 2.0.0-alpha.0~59^2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=4ab58dcf6c833170c307de120698740fe0685efb;p=github%2Fwallabag%2Fwallabag.git set material to default theme \o/ --- diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index f80f65ad..97933ec3 100644 --- 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 900e151d..3bb5c5f2 100644 --- 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 f72cba65..5ab9c329 100644 --- 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 e560ffdd..a51e836d 100644 --- 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);