From: Dan Brown Date: Sun, 13 Mar 2016 14:00:24 +0000 (+0000) Subject: Forced browser scrollbar, Added custom theme compatible logo X-Git-Tag: v0.8.0~1^2~1 X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/a06321675aa29567d030dd42e116d464b611bbc6 Forced browser scrollbar, Added custom theme compatible logo Also removed link to search all pages if no pages mached search on global search page. Closes #74. --- diff --git a/public/logo.png b/public/logo.png index 6e14c8c8a..1803feebf 100644 Binary files a/public/logo.png and b/public/logo.png differ diff --git a/resources/assets/sass/_forms.scss b/resources/assets/sass/_forms.scss index 76c9674f5..037dad94a 100644 --- a/resources/assets/sass/_forms.scss +++ b/resources/assets/sass/_forms.scss @@ -187,4 +187,8 @@ input:checked + .toggle-switch { } #login-form label.toggle-switch { margin-left: $-xl; +} + +.image-picker img { + background-color: #BBB; } \ No newline at end of file diff --git a/resources/assets/sass/_html.scss b/resources/assets/sass/_html.scss index 07ffb10a6..ea97a4dd2 100644 --- a/resources/assets/sass/_html.scss +++ b/resources/assets/sass/_html.scss @@ -4,6 +4,10 @@ html { background-color: #FFFFFF; height: 100%; + overflow-y: scroll; + &.flexbox { + overflow-y: hidden; + } } body { font-family: $text; diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index 5c744d821..4c5ccf834 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -1,5 +1,5 @@ - + {{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name', 'BookStack') }} diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php index f2385a5d3..c2ba34145 100644 --- a/resources/views/search/all.blade.php +++ b/resources/views/search/all.blade.php @@ -7,7 +7,11 @@

Search Results    {{$searchTerm}}

- View all matched pages + + @if(count($pages) > 0) + View all matched pages + @endif + @if(count($chapters) > 0)