luisgulo/BookStack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated composer, Fixed sidebar tree list & Added extra pages to Dummy seeder. Fixes #28, Fixes #29

Browse source
This commit is contained in:
Dan Brown 2015-12-02 19:10:05 +00:00
parent 5e21ecc526
commit 9f435553dc
4 changed files with 339 additions and 268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
composer.json
View file

@ -8,15 +8,15 @@
"php": ">=5.5.9", "php": ">=5.5.9",
"laravel/framework": "5.1.*", "laravel/framework": "5.1.*",
"intervention/image": "^2.3", "intervention/image": "^2.3",
"laravel/socialite": "^2.0" "laravel/socialite": "^2.0",
"barryvdh/laravel-ide-helper": "^2.1",
"barryvdh/laravel-debugbar": "^2.0"
}, },
"require-dev": { "require-dev": {
"fzaninotto/faker": "~1.4", "fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*", "mockery/mockery": "0.9.*",
"phpunit/phpunit": "~4.0", "phpunit/phpunit": "~4.0",
"phpspec/phpspec": "~2.1", "phpspec/phpspec": "~2.1"
"barryvdh/laravel-ide-helper": "^2.1",
"barryvdh/laravel-debugbar": "^2.0"
}, },
"autoload": { "autoload": {
"classmap": [ "classmap": [

590
composer.lock generated
View file

File diff suppressed because it is too large Load diff

2
database/seeds/DummyContentSeeder.php
View file

@ -23,7 +23,9 @@ class DummyContentSeeder extends Seeder
$pages = factory(\BookStack\Page::class, 10)->make(['created_by' => $user->id, 'updated_by' => $user->id, 'book_id' => $book->id]); $pages = factory(\BookStack\Page::class, 10)->make(['created_by' => $user->id, 'updated_by' => $user->id, 'book_id' => $book->id]);
$chapter->pages()->saveMany($pages); $chapter->pages()->saveMany($pages);
}); });
$pages = factory(\BookStack\Page::class, 3)->make(['created_by' => $user->id, 'updated_by' => $user->id]);
$book->chapters()->saveMany($chapters); $book->chapters()->saveMany($chapters);
$book->pages()->saveMany($pages);
}); });
} }
} }

7
resources/assets/sass/_lists.scss
View file

@ -118,6 +118,9 @@
text-decoration: none; text-decoration: none;
} }
} }
li a i {
padding-right: $-xs + 2px;
}
li, a { li, a {
display: block; display: block;
} }
@ -150,11 +153,11 @@
} }
.list-item-page { .list-item-page {
border-bottom: none; border-bottom: none;
border-left: 5px solid $color-page;
margin: 10px 10px;
} }
.page { .page {
color: $color-page !important; color: $color-page !important;
border-left: 5px solid $color-page;
margin: 10px 10px;
border-bottom: none; border-bottom: none;
&.selected { &.selected {
background-color: rgba($color-page, 0.1); background-color: rgba($color-page, 0.1);