]> BookStack Code Mirror - bookstack/commitdiff
projects / bookstack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side (parent: 4c0783f)
Added logo and favicon
authorDan Brown <redacted>
Thu, 16 Jul 2015 20:24:26 +0000 (21:24 +0100)
committerDan Brown <redacted>
Thu, 16 Jul 2015 20:24:26 +0000 (21:24 +0100)
public/bookstack.svg [new file with mode: 0644] patch | blob
public/favicon.ico patch | blob | history
resources/assets/sass/styles.scss patch | blob | history
resources/views/base.blade.php patch | blob | history
resources/views/pages/create.blade.php patch | blob | history

diff --git a/public/bookstack.svg b/public/bookstack.svg
new file mode 100644 (file)
index 0000000..67c2789
--- /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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d986013b86875a4397577f8657d371bc9813b8e6 100644 (file)
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 9dc65cb8d17a7cc41d238276f60cd0783e4d779b..17f7027043cde29733fe858a9f184eb2535e7207 100644 (file)
--- 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 6345de2b4ea2be75bc5d64d5c74c2be05403d326..59860b03764106027eb01614967c17725738f135 100644 (file)
--- 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 d59f18e5b3f21c09662b9e7fb71187d6f33e69ee..8276f4d911ee308eb771b9e008f15cfb17ea6e5a 100644 (file)
--- 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')
The core source code for the BookStack project.