mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-15 21:41:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1279 from wallabag/material-default

Browse source 
set material to default theme \o/
This commit is contained in:
Jeremy Benoist 2015-08-04 23:13:15 +02:00
commit 8d9b8912af
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/config/parameters.yml.dist
View file

@ -40,7 +40,7 @@ parameters:
# default user config # default user config
items_on_page: 12 items_on_page: 12
theme: baggy theme: material
language: en_US language: en_US
from_email: no-reply@wallabag.org from_email: no-reply@wallabag.org
rss_limit: 50 rss_limit: 50

2
src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php
View file

@ -15,7 +15,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
public function load(ObjectManager $manager) public function load(ObjectManager $manager)
{ {
$adminConfig = new Config($this->getReference('admin-user')); $adminConfig = new Config($this->getReference('admin-user'));
$adminConfig->setTheme('baggy'); $adminConfig->setTheme('material');
$adminConfig->setItemsPerPage(30); $adminConfig->setItemsPerPage(30);
$adminConfig->setLanguage('en_US'); $adminConfig->setLanguage('en_US');

2
src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
View file

@ -102,7 +102,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
return array( return array(
array( array(
array( array(
'change_passwd[old_password]' => 'baggy', 'change_passwd[old_password]' => 'material',
'change_passwd[new_password][first]' => '', 'change_passwd[new_password][first]' => '',
'change_passwd[new_password][second]' => '', 'change_passwd[new_password][second]' => '',
), ),

2
src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
View file

@ -69,7 +69,7 @@ class SecurityControllerTest extends WallabagCoreTestCase
$client = $parameters['client']; $client = $parameters['client'];
$data = array( $data = array(
'forgot_password[email]' => 'baggy', 'forgot_password[email]' => 'material',
); );
$client->submit($form, $data); $client->submit($form, $data);