Зуев Егор / wiki.dev

Go to a project
Toggle navigation
Toggle navigation pinning
Dan Brown
3aaab238 1 parent 144eb69c

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

Inline Side-by-side
Showing 7 changed files with 37 additions and 14 deletions
1 -<?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 ...\ No newline at end of file
No preview for this file type
...@@ -53,10 +53,10 @@ form.search-box { ...@@ -53,10 +53,10 @@ form.search-box {
53 text-align: left; 53 text-align: left;
54 input { 54 input {
55 background-color: transparent; 55 background-color: transparent;
56 - border-radius: 0; 56 + border-radius: 24px;
57 - border: none; 57 + border: 2px solid #EEE;
58 - border-bottom: 2px solid #EEE;
59 color: #EEE; 58 color: #EEE;
59 + padding-left: $-m;
60 padding-right: $-l; 60 padding-right: $-l;
61 outline: 0; 61 outline: 0;
62 } 62 }
...@@ -64,8 +64,8 @@ form.search-box { ...@@ -64,8 +64,8 @@ form.search-box {
64 vertical-align: top; 64 vertical-align: top;
65 margin-left: -$-l; 65 margin-left: -$-l;
66 color: #FFF; 66 color: #FFF;
67 - top: 0; 67 + top: 6px;
68 - right: 0; 68 + right: 4px;
69 display: inline-block; 69 display: inline-block;
70 position: absolute; 70 position: absolute;
71 &:hover { 71 &:hover {
...@@ -76,16 +76,24 @@ form.search-box { ...@@ -76,16 +76,24 @@ form.search-box {
76 76
77 .logo { 77 .logo {
78 display: inline-block; 78 display: inline-block;
79 + &:hover {
80 + color: #FFF;
81 + text-decoration: none;
82 + }
83 +}
84 +.logo-text {
85 + display: inline-block;
79 font-size: 1.8em; 86 font-size: 1.8em;
80 color: #fff; 87 color: #fff;
81 font-weight: 400; 88 font-weight: 400;
82 padding: $-l $-l $-l 0; 89 padding: $-l $-l $-l 0;
83 vertical-align: top; 90 vertical-align: top;
84 line-height: 1; 91 line-height: 1;
85 - &:hover { 92 +}
86 - color: #FFF; 93 +.logo-image {
87 - text-decoration: none; 94 + padding: $-m $-s $-m 0;
88 - } 95 + vertical-align: top;
96 + height: 75px;
89 } 97 }
90 98
91 .dropdown-container { 99 .dropdown-container {
......
...@@ -40,7 +40,10 @@ ...@@ -40,7 +40,10 @@
40 <div class="container"> 40 <div class="container">
41 <div class="row"> 41 <div class="row">
42 <div class="col-md-4 col-sm-3"> 42 <div class="col-md-4 col-sm-3">
43 - <a href="/" class="logo">{{ Setting::get('app-name', 'BookStack') }}</a> 43 + <a href="/" class="logo">
44 + <img class="logo-image" src="/logo.png" alt="Logo">
45 + <span class="logo-text">{{ Setting::get('app-name', 'BookStack') }}</span>
46 + </a>
44 </div> 47 </div>
45 <div class="col-md-4 col-sm-3 text-center"> 48 <div class="col-md-4 col-sm-3 text-center">
46 <form action="/search/all" method="GET" class="search-box"> 49 <form action="/search/all" method="GET" class="search-box">
......
...@@ -2,10 +2,19 @@ ...@@ -2,10 +2,19 @@
2 2
3 @section('content') 3 @section('content')
4 4
5 - <div class="page-content"> 5 +
6 - @include('pages/page-display') 6 + <div class="container">
7 + <div class="row">
8 + <div class="col-md-9">
9 + <div class="page-content anim fadeIn">
10 + @include('pages/page-display')
11 + </div>
12 + </div>
13 + </div>
7 </div> 14 </div>
8 15
16 +
17 +
9 <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/styles/solarized_light.min.css"> 18 <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/styles/solarized_light.min.css">
10 <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/highlight.min.js"></script> 19 <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/highlight.min.js"></script>
11 <script> 20 <script>
......
...@@ -30,7 +30,11 @@ ...@@ -30,7 +30,11 @@
30 <div class="container"> 30 <div class="container">
31 <div class="row"> 31 <div class="row">
32 <div class="col-md-6"> 32 <div class="col-md-6">
33 - <a href="/" class="logo">{{ Setting::get('app-name', 'BookStack') }}</a> 33 +
34 + <a href="/" class="logo">
35 + <img class="logo-image" src="/logo.png" alt="Logo">
36 + <span class="logo-text">{{ Setting::get('app-name', 'BookStack') }}</span>
37 + </a>
34 </div> 38 </div>
35 <div class="col-md-6"> 39 <div class="col-md-6">
36 <div class="float right"> 40 <div class="float right">
......