Dan Brown

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.

3.06 KB | W: | H:

4.57 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -188,3 +188,7 @@ input:checked + .toggle-switch { ...@@ -188,3 +188,7 @@ input:checked + .toggle-switch {
188 #login-form label.toggle-switch { 188 #login-form label.toggle-switch {
189 margin-left: $-xl; 189 margin-left: $-xl;
190 } 190 }
191 +
192 +.image-picker img {
193 + background-color: #BBB;
194 +}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
4 html { 4 html {
5 background-color: #FFFFFF; 5 background-color: #FFFFFF;
6 height: 100%; 6 height: 100%;
7 + overflow-y: scroll;
8 + &.flexbox {
9 + overflow-y: hidden;
10 + }
7 } 11 }
8 body { 12 body {
9 font-family: $text; 13 font-family: $text;
......
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 -<html> 2 +<html class="@yield('body-class')">
3 <head> 3 <head>
4 <title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name', 'BookStack') }}</title> 4 <title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name', 'BookStack') }}</title>
5 5
......
...@@ -7,7 +7,11 @@ ...@@ -7,7 +7,11 @@
7 <h1>Search Results&nbsp;&nbsp;&nbsp; <span class="text-muted">{{$searchTerm}}</span></h1> 7 <h1>Search Results&nbsp;&nbsp;&nbsp; <span class="text-muted">{{$searchTerm}}</span></h1>
8 8
9 <p> 9 <p>
10 +
11 + @if(count($pages) > 0)
10 <a href="/search/pages?term={{$searchTerm}}" class="text-page"><i class="zmdi zmdi-file-text"></i>View all matched pages</a> 12 <a href="/search/pages?term={{$searchTerm}}" class="text-page"><i class="zmdi zmdi-file-text"></i>View all matched pages</a>
13 + @endif
14 +
11 15
12 @if(count($chapters) > 0) 16 @if(count($chapters) > 0)
13 &nbsp; &nbsp;&nbsp; 17 &nbsp; &nbsp;&nbsp;
......