]> BookStack Code Mirror - bookstack/commitdiff
Forced browser scrollbar, Added custom theme compatible logo
authorDan Brown <redacted>
Sun, 13 Mar 2016 14:00:24 +0000 (14:00 +0000)
committerDan Brown <redacted>
Sun, 13 Mar 2016 14:00:24 +0000 (14:00 +0000)
Also removed link to search all pages if no pages mached search on global search page.
Closes #74.

public/logo.png
resources/assets/sass/_forms.scss
resources/assets/sass/_html.scss
resources/views/base.blade.php
resources/views/search/all.blade.php

index 6e14c8c8aee95e857cd8e19b9359f662971f967a..1803feebf53414a98b6d670e4d6746a40b444ddb 100644 (file)
Binary files a/public/logo.png and b/public/logo.png differ
index 76c9674f5c612fa2798abd86a40161f956f9d2da..037dad94a4d73755e8d38d8b72edc19ec27c7bc2 100644 (file)
@@ -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
index 07ffb10a6c2f1410bd42501243ee027cc4325ab5..ea97a4dd2a681f7b253fc90078bbeaec9d260ece 100644 (file)
@@ -4,6 +4,10 @@
 html {
   background-color: #FFFFFF;
   height: 100%;
+  overflow-y: scroll;
+  &.flexbox {
+    overflow-y: hidden;
+  }
 }
 body {
   font-family: $text;
index 5c744d821fc123a80259aad71059a3a699a43d95..4c5ccf83442e3c421507651def6297522cb41975 100644 (file)
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="@yield('body-class')">
 <head>
     <title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name', 'BookStack') }}</title>
 
index f2385a5d3f08077f88aa77623652168b7d7c8651..c2ba341450fcdb1522579006502ef5c57e0fd6c7 100644 (file)
@@ -7,7 +7,11 @@
         <h1>Search Results&nbsp;&nbsp;&nbsp; <span class="text-muted">{{$searchTerm}}</span></h1>
 
         <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)
                 &nbsp; &nbsp;&nbsp;
Morty Proxy This is a proxified and sanitized view of the page, visit original site.