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

This commit is contained in:
Dan Brown 2015-10-01 21:08:36 +01:00
parent 144eb69cad
commit 3aaab238d0
7 changed files with 37 additions and 14 deletions

View File

@ -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>

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 379 B

After

Width:  |  Height:  |  Size: 11 KiB

BIN
public/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -53,10 +53,10 @@ form.search-box {
text-align: left; text-align: left;
input { input {
background-color: transparent; background-color: transparent;
border-radius: 0; border-radius: 24px;
border: none; border: 2px solid #EEE;
border-bottom: 2px solid #EEE;
color: #EEE; color: #EEE;
padding-left: $-m;
padding-right: $-l; padding-right: $-l;
outline: 0; outline: 0;
} }
@ -64,8 +64,8 @@ form.search-box {
vertical-align: top; vertical-align: top;
margin-left: -$-l; margin-left: -$-l;
color: #FFF; color: #FFF;
top: 0; top: 6px;
right: 0; right: 4px;
display: inline-block; display: inline-block;
position: absolute; position: absolute;
&:hover { &:hover {
@ -75,6 +75,13 @@ form.search-box {
} }
.logo { .logo {
display: inline-block;
&:hover {
color: #FFF;
text-decoration: none;
}
}
.logo-text {
display: inline-block; display: inline-block;
font-size: 1.8em; font-size: 1.8em;
color: #fff; color: #fff;
@ -82,10 +89,11 @@ form.search-box {
padding: $-l $-l $-l 0; padding: $-l $-l $-l 0;
vertical-align: top; vertical-align: top;
line-height: 1; line-height: 1;
&:hover { }
color: #FFF; .logo-image {
text-decoration: none; padding: $-m $-s $-m 0;
} vertical-align: top;
height: 75px;
} }
.dropdown-container { .dropdown-container {

View File

@ -40,7 +40,10 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-4 col-sm-3"> <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>
<div class="col-md-4 col-sm-3 text-center"> <div class="col-md-4 col-sm-3 text-center">
<form action="/search/all" method="GET" class="search-box"> <form action="/search/all" method="GET" class="search-box">

View File

@ -2,10 +2,19 @@
@section('content') @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> </div>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/styles/solarized_light.min.css"> <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 src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/highlight.min.js"></script>
<script> <script>

View File

@ -30,7 +30,11 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-6"> <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>
<div class="col-md-6"> <div class="col-md-6">
<div class="float right"> <div class="float right">