Added a logo and fixed old revision layout. Fixes BookStackApp#16.

billsecond · Oct 1, 2015 · 3aaab23 · 3aaab23
1 parent 144eb69
commit 3aaab23
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 14 deletions.
diff --git a/public/bookstack.svg b/public/bookstack.svg
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/logo.png b/public/logo.png
diff --git a/resources/assets/sass/_header.scss b/resources/assets/sass/_header.scss
@@ -53,19 +53,19 @@ form.search-box {
   text-align: left;
   input {
     background-color: transparent;
-    border-radius: 0;
-    border: none;
-    border-bottom: 2px solid #EEE;
+    border-radius: 24px;
+    border: 2px solid #EEE;
     color: #EEE;
+    padding-left: $-m;
     padding-right: $-l;
     outline: 0;
   }
   button {
     vertical-align: top;
     margin-left: -$-l;
     color: #FFF;
-    top: 0;
-    right: 0;
+    top: 6px;
+    right: 4px;
     display: inline-block;
     position: absolute;
     &:hover {
@@ -75,17 +75,25 @@ form.search-box {
 }
 
 .logo {
+  display: inline-block;
+  &:hover {
+    color: #FFF;
+    text-decoration: none;
+  }
+}
+.logo-text {
   display: inline-block;
   font-size: 1.8em;
   color: #fff;
   font-weight: 400;
   padding: $-l $-l $-l 0;
   vertical-align: top;
   line-height: 1;
-  &:hover {
-    color: #FFF;
-    text-decoration: none;
-  }
+}
+.logo-image {
+  padding: $-m $-s $-m 0;
+  vertical-align: top;
+  height: 75px;
 }
 
 .dropdown-container {

diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
@@ -40,7 +40,10 @@
         <div class="container">
             <div class="row">
                 <div class="col-md-4 col-sm-3">
-                    <a href="/" class="logo">{{ Setting::get('app-name', 'BookStack') }}</a>
+                    <a href="/" class="logo">
+                        <img class="logo-image" src="/logo.png" alt="Logo">
+                        <span class="logo-text">{{ Setting::get('app-name', 'BookStack') }}</span>
+                    </a>
                 </div>
                 <div class="col-md-4 col-sm-3 text-center">
                     <form action="/search/all" method="GET" class="search-box">

diff --git a/resources/views/pages/revision.blade.php b/resources/views/pages/revision.blade.php
@@ -2,10 +2,19 @@
 
 @section('content')
 
-    <div class="page-content">
-        @include('pages/page-display')
+
+    <div class="container">
+        <div class="row">
+            <div class="col-md-9">
+                <div class="page-content anim fadeIn">
+                    @include('pages/page-display')
+                </div>
+            </div>
+        </div>
     </div>
 
+
+
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/styles/solarized_light.min.css">
     <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/highlight.min.js"></script>
     <script>

diff --git a/resources/views/public.blade.php b/resources/views/public.blade.php
@@ -30,7 +30,11 @@
     <div class="container">
         <div class="row">
             <div class="col-md-6">
-                <a href="/" class="logo">{{ Setting::get('app-name', 'BookStack') }}</a>
+
+                <a href="/" class="logo">
+                    <img class="logo-image" src="/logo.png" alt="Logo">
+                    <span class="logo-text">{{ Setting::get('app-name', 'BookStack') }}</span>
+                </a>
             </div>
             <div class="col-md-6">
                 <div class="float right">