From a06321675aa29567d030dd42e116d464b611bbc6 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 13 Mar 2016 14:00:24 +0000 Subject: [PATCH] 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. --- public/logo.png | Bin 3135 -> 4682 bytes resources/assets/sass/_forms.scss | 4 ++++ resources/assets/sass/_html.scss | 4 ++++ resources/views/base.blade.php | 2 +- resources/views/search/all.blade.php | 6 +++++- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/public/logo.png b/public/logo.png index 6e14c8c8aee95e857cd8e19b9359f662971f967a..1803feebf53414a98b6d670e4d6746a40b444ddb 100644 GIT binary patch literal 4682 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 literal 3135 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 Z@ISdRdY}-U`|bb$002ovPDHLkV1o6#2txn> 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)