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.
This commit is contained in:
Dan Brown 2016-03-13 14:00:24 +00:00
parent dbe11c1360
commit a06321675a
5 changed files with 14 additions and 2 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

@ -187,4 +187,8 @@ input:checked + .toggle-switch {
} }
#login-form label.toggle-switch { #login-form label.toggle-switch {
margin-left: $-xl; margin-left: $-xl;
}
.image-picker img {
background-color: #BBB;
} }

View File

@ -4,6 +4,10 @@
html { html {
background-color: #FFFFFF; background-color: #FFFFFF;
height: 100%; height: 100%;
overflow-y: scroll;
&.flexbox {
overflow-y: hidden;
}
} }
body { body {
font-family: $text; font-family: $text;

View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html class="@yield('body-class')">
<head> <head>
<title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name', 'BookStack') }}</title> <title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name', 'BookStack') }}</title>

View File

@ -7,7 +7,11 @@
<h1>Search Results&nbsp;&nbsp;&nbsp; <span class="text-muted">{{$searchTerm}}</span></h1> <h1>Search Results&nbsp;&nbsp;&nbsp; <span class="text-muted">{{$searchTerm}}</span></h1>
<p> <p>
<a href="/search/pages?term={{$searchTerm}}" class="text-page"><i class="zmdi zmdi-file-text"></i>View all matched pages</a>
@if(count($pages) > 0)
<a href="/search/pages?term={{$searchTerm}}" class="text-page"><i class="zmdi zmdi-file-text"></i>View all matched pages</a>
@endif
@if(count($chapters) > 0) @if(count($chapters) > 0)
&nbsp; &nbsp;&nbsp; &nbsp; &nbsp;&nbsp;