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

diff --git a/public/bookstack.svg b/public/bookstack.svg
deleted file mode 100644 (file)
index 67c2789..0000000
--- a/public/bookstack.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 246 35" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><g id="Layer1"><text x="70.385px" y="30.01px" style="font-family:Roboto;font-size:36.52px;font-weight:500;fill:#444;">B<tspan x="93.058px 113.485px 133.912px 152.61px 174.285px 186.063px 205.456px 224.207px " y="30.01px 30.01px 30.01px 30.01px 30.01px 30.01px 30.01px 30.01px ">ookStack</tspan></text></g><g id="Stack of books"><rect x="34.126" y="24.108" width="32.613" height="5.902" style="fill:#1c77c1;"/><rect x="34.126" y="14.07" width="32.613" height="5.902" style="fill:#1c77c1;"/><rect x="34.126" y="4.032" width="32.613" height="5.902" style="fill:#1c77c1;"/></g><g id="Layer2"><path d="M5.972,30.01l22.828,-25.978l-0.266,0l0,25.978l-22.562,0Z" style="fill:#444;"/></g></svg>
\ No newline at end of file

diff --git a/public/favicon.ico b/public/favicon.ico
index d986013b86875a4397577f8657d371bc9813b8e6..41655ccba55f8dd5f250471eb2e8928b21a85992 100644 (file)
Binary files a/public/favicon.ico and b/public/favicon.ico differ

diff --git a/public/logo.png b/public/logo.png
new file mode 100644 (file)
index 0000000..6e14c8c
Binary files /dev/null and b/public/logo.png differ

diff --git a/resources/assets/sass/_header.scss b/resources/assets/sass/_header.scss
index b011fe129b99ef17723faacc79b7112853f352e9..adc1df1971d53a6a019113348a15edc66d156b52 100644 (file)
--- a/resources/assets/sass/_header.scss
+++ b/resources/assets/sass/_header.scss
@@ -53,10 +53,10 @@ 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;
   }
@@ -64,8 +64,8 @@ form.search-box {
     vertical-align: top;
     margin-left: -$-l;
     color: #FFF;
-    top: 0;
-    right: 0;
+    top: 6px;
+    right: 4px;
     display: inline-block;
     position: absolute;
     &:hover {
@@ -75,6 +75,13 @@ form.search-box {
 }
 
 .logo {
+  display: inline-block;
+  &:hover {
+    color: #FFF;
+    text-decoration: none;
+  }
+}
+.logo-text {
   display: inline-block;
   font-size: 1.8em;
   color: #fff;
@@ -82,10 +89,11 @@ form.search-box {
   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
index 3f730ef3891feb37ef5376be6d577da553f13607..39bbfee321bb8ad75863ffad9a5c594d449b2817 100644 (file)
--- 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
index 4d8e04e3094faf4590af1b2f84507bb25b0a1256..cca34dd5547a729ced33ffd5637392627caba0ce 100644 (file)
--- 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
index 73c8384fc2473300bcad33290915ae0964121ef0..7606f936aa2260fa93663f4ee67a8e8ddf15d521 100644 (file)
--- 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">