diff --git a/public/bookstack.svg b/public/bookstack.svg new file mode 100644 index 000000000..67c278901 --- /dev/null +++ b/public/bookstack.svg @@ -0,0 +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 diff --git a/public/favicon.ico b/public/favicon.ico index e69de29bb..d986013b8 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/resources/assets/sass/styles.scss b/resources/assets/sass/styles.scss index 9dc65cb8d..17f702704 100644 --- a/resources/assets/sass/styles.scss +++ b/resources/assets/sass/styles.scss @@ -17,6 +17,10 @@ header { z-index: -1; top: 0; } +.logo { + width: 180px; + opacity: 0.8; +} body { margin-top: 64px; diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index 6345de2b4..59860b037 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <title>Oxbow</title> + <title>BookStack</title> <meta name="viewport" content="width=device-width"> <link rel="stylesheet" href="/css/app.css"> <link href='http://fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300' rel='stylesheet' type='text/css'> @@ -30,7 +30,7 @@ <div class="container"> <div class="padded-vertical row clearfix"> <div class="col-md-3"> - <div class="logo float left">Oxbow</div> + <div ><img class="logo float left" src="/bookstack.svg" alt="BookStack"></div> </div> <div class="col-md-9"> <ul class="menu float"> diff --git a/resources/views/pages/create.blade.php b/resources/views/pages/create.blade.php index d59f18e5b..8276f4d91 100644 --- a/resources/views/pages/create.blade.php +++ b/resources/views/pages/create.blade.php @@ -10,12 +10,6 @@ <form action="{{$book->getUrl() . '/page'}}" method="POST"> @include('pages/form') </form> - - <script> - $(function() { - $('#html').editable({inlineMode: false}); - }); - </script> @stop @section('bottom')