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:
		
							parent
							
								
									dbe11c1360
								
							
						
					
					
						commit
						a06321675a
					
				
							
								
								
									
										
											BIN
										
									
								
								public/logo.png
								
								
								
								
							
							
						
						
									
										
											BIN
										
									
								
								public/logo.png
								
								
								
								
							
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 4.6 KiB  | 
| 
						 | 
				
			
			@ -188,3 +188,7 @@ input:checked + .toggle-switch {
 | 
			
		|||
#login-form label.toggle-switch {
 | 
			
		||||
  margin-left: $-xl;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.image-picker img {
 | 
			
		||||
  background-color: #BBB;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -4,6 +4,10 @@
 | 
			
		|||
html {
 | 
			
		||||
  background-color: #FFFFFF;
 | 
			
		||||
  height: 100%;
 | 
			
		||||
  overflow-y: scroll;
 | 
			
		||||
  &.flexbox {
 | 
			
		||||
    overflow-y: hidden;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
body {
 | 
			
		||||
  font-family: $text;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
<!DOCTYPE html>
 | 
			
		||||
<html>
 | 
			
		||||
<html class="@yield('body-class')">
 | 
			
		||||
<head>
 | 
			
		||||
    <title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name', 'BookStack') }}</title>
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -7,7 +7,11 @@
 | 
			
		|||
        <h1>Search Results    <span class="text-muted">{{$searchTerm}}</span></h1>
 | 
			
		||||
 | 
			
		||||
        <p>
 | 
			
		||||
 | 
			
		||||
            @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)
 | 
			
		||||
                    
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue