]> BookStack Code Mirror - bookstack/commitdiff
Started redesign
authorDan Brown <redacted>
Tue, 21 Jul 2015 21:11:30 +0000 (22:11 +0100)
committerDan Brown <redacted>
Tue, 21 Jul 2015 21:11:30 +0000 (22:11 +0100)
resources/assets/sass/_forms.scss
resources/assets/sass/_html.scss
resources/assets/sass/_tinymce.scss
resources/assets/sass/styles.scss
resources/views/base.blade.php
resources/views/pages/edit.blade.php
resources/views/pages/form.blade.php
resources/views/pages/show.blade.php

index 861cfbb9fae95829028e1dd3c30592ba0790125b..c2755efe32738bc6e4963c652c1ee208297a9c5c 100644 (file)
@@ -65,15 +65,13 @@ input[type="text"], input[type="number"], input[type="email"], input[type="searc
 }
 
 .title-input.page-title {
-  padding: $-s;
+  font-size: 0.8em;
 }
 .title-input.page-title input[type="text"]{
   //border: 2px dotted #BBB;
   margin-bottom: 0;
 }
-.edit-area {
-  padding:  0 $-s $-s $-s;
-}
+
 
 .description-input textarea {
   @extend .inline-input-style;
index 6b21a48a78f5ac8ed2780cd9e90c77c2d15dd6b2..5071b32967897e3d8f4d4e3057fc0f14098cd0f8 100644 (file)
@@ -2,7 +2,7 @@
        box-sizing: border-box;
 }
 html {
-       background-color: #f8f8f8;
+       background-color: #FFFFFF;
 }
 body {
        font-family: $text;
index 9c7c398cf90dd331e6394094a0d0c9882be4d300..10a3c017551a970e37ff1b9cf359c91e55ff37cd 100644 (file)
   max-width: 100%;
   margin-left: -$-s;
   box-shadow: 0 0 4px 2px rgba(0, 0, 0, 0.08);
+}
+
+.edit-area {
+  height: 100%;
+}
+
+.page-style.editor {
+  height: 100%;
 }
\ No newline at end of file
index 0fd4f638d6d7317f6e0f1d8fc460c9f8a077573b..421686db0b803c52c2e00e6f808c1829b67fca9f 100644 (file)
 
 header {
   background-color: #f8f8f8;
-  position: fixed;
   display: block;
   width: 100%;
-  z-index: -1;
+  position: fixed;
+  z-index: 2;
   top: 0;
+  border-bottom: 1px solid #DDD;
+  .padded {
+    padding: $-m;
+  }
+}
+
+#sidebar {
+  position: fixed;
+  background-color: #FFF;
+  height: 100%;
+  top: 0;
+  z-index: 1;
+  padding-top: 63px + $-m;
+  width: 300px;
+  border-right: 1px solid #DDD;
+}
+
+#content {
+  margin-top: 63px;
+  margin-left: 300px;
+  display: block;
+  position: relative;
 }
+
 .logo {
   width: 180px;
   opacity: 0.8;
 }
 
-body {
-  margin-top: 64px;
-}
-
 header hr {
   margin-top: 0;
 }
@@ -46,15 +65,8 @@ header .menu {
   font-size: 1.4em;
 }
 
-.affix {
-  position: fixed;
-}
-
 .page-style {
-  background-color: #FFF;
   padding: $-s $-xxl $-xxl $-xxl;
-  border-radius: 4px;
-  box-shadow: 0 0 9px 0 rgba(0, 0, 0, 0.15);
   margin-bottom: $-xxl;
   max-width: 100%;
 }
@@ -66,6 +78,9 @@ header .menu {
 .page-content {
   @extend .page-style;
   min-height: 70vh;
+  max-width: 840px;
+  margin-left: auto;
+  margin-right: auto;
   &.right {
     float: right;
   }
index 282b0d35e659702689303a2e477a0fa0a0588c2b..bae7a4f2c39d8cdf51f04539f5e3efe76978f33f 100644 (file)
 <body>
 
     <header>
-        <div class="container">
-            <div class="padded-vertical row clearfix">
-                <div class="col-md-3">
-                    <div ><img class="logo float left" src="/bookstack.svg" alt="BookStack"></div>
-                </div>
-                <div class="col-md-9">
-                    <ul class="menu float">
-                        <li><a href="/books"><i class="fa fa-book"></i>Books</a></li>
-                    </ul>
-                    <div class="search-box float right">
-                        <form action="/pages/search/all" id="search-form" method="GET">
-                            {!! csrf_field() !!}
-                            <input type="text" placeholder="Search all pages..." name="term" id="search-input">
-                        </form>
-                    </div>
+        <div class="padded row clearfix">
+            <div class="col-md-3">
+                <div ><img class="logo float left" src="/bookstack.svg" alt="BookStack"></div>
+            </div>
+            <div class="col-md-9">
+                <ul class="menu float">
+                    <li><a href="/books"><i class="fa fa-book"></i>Books</a></li>
+                </ul>
+                <div class="search-box float right">
+                    <form action="/pages/search/all" id="search-form" method="GET">
+                        {!! csrf_field() !!}
+                        <input type="text" placeholder="Search all pages..." name="term" id="search-input">
+                    </form>
                 </div>
             </div>
         </div>
     </header>
 
-    <section class="container">
+    <section id="sidebar" class="padded">
+        @yield('sidebar')
+    </section>
+
+    <section id="content">
         @yield('content')
     </section>
 
index 30a27cb796365fba24c893e116a0c8c727c07aaf..fee9782fdf62f1a3b0bfc03c7df2fbb78fe3a153 100644 (file)
@@ -8,12 +8,10 @@
 
 @section('content')
 
-    <div class="row">
-        <form action="{{$page->getUrl()}}" method="POST">
-            <input type="hidden" name="_method" value="PUT">
-            @include('pages/form', ['model' => $page])
-        </form>
-    </div>
+    <form action="{{$page->getUrl()}}" method="POST">
+        <input type="hidden" name="_method" value="PUT">
+        @include('pages/form', ['model' => $page])
+    </form>
 
 @stop
 
index a100bdbca48d45b511cbbd92432e190805fd3ab3..4028998c9723233631ba83d04652a2e0d5b51421 100644 (file)
@@ -1,14 +1,14 @@
 
-<div class="col-md-3 page-menu">
-    <h4>You are editing a page</h4>
-    <button type="submit" class="button pos">Save Page</button>
-</div>
 
-<div class="col-md-9 page-style editor">
+
+<div class="page-style editor">
 
     {{ csrf_field() }}
-    <div class="title-input page-title">
-        @include('form/text', ['name' => 'name', 'placeholder' => 'Enter Page Title'])
+    <div class="title-input title-strip clearfix">
+        <button type="submit" class="button pos float right">Save Page</button>
+        <div class="float left">
+            @include('form/text', ['name' => 'name', 'placeholder' => 'Enter Page Title'])
+        </div>
     </div>
     <div class="edit-area">
         @include('form/textarea', ['name' => 'html'])
@@ -29,6 +29,7 @@
             content_css: '/css/app.css',
             body_class: 'container',
             relative_urls: false,
+            statusbar: false,
             height: 600,
             plugins: "image table textcolor paste link imagetools",
             toolbar: "undo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image link | fontsizeselect full",
index a5eac3c98172093f20e7717068ab4e8cb203bd90..f623168f6b0622817da8c0ecd3a64bf8cc9d0693 100644 (file)
@@ -1,24 +1,24 @@
 @extends('base')
 
+@section('sidebar')
+    <div class="page-nav">
+        <h4>Navigation</h4>
+        <ul class="page-nav-list"></ul>
+    </div>
+    <div class="page-actions">
+        <h4>Actions</h4>
+        <div class="list">
+            <a href="{{$page->getUrl() . '/edit'}}" class="muted"><i class="fa fa-pencil"></i>Edit this page</a>
+            <a href="{{$page->getUrl() . '/create'}}" class="muted"><i class="fa fa-file-o"></i>Create Sub-page</a>
+        </div>
+    </div>
+@stop
+
 @section('content')
 
     <div class="row">
-        <div class="page-menu col-md-3">
-            <div class="page-nav">
-                <h4>Navigation</h4>
-                <ul class="page-nav-list"></ul>
-            </div>
-            <div class="page-actions">
-                <h4>Actions</h4>
-                <div class="list">
-                    <a href="{{$page->getUrl() . '/edit'}}" class="muted"><i class="fa fa-pencil"></i>Edit this page</a>
-                    <a href="{{$page->getUrl() . '/create'}}" class="muted"><i class="fa fa-file-o"></i>Create Sub-page</a>
-                </div>
-            </div>
-        </div>
-
-        <div class="page-content right col-md-9">
-            <div class="breadcrumbs">
+        <div class="col-md-6">
+            <div class="breadcrumbs padded-horizontal">
                 <a href="{{$book->getUrl()}}"><i class="fa fa-book"></i>{{ $book->name }}</a>
                 @if($breadCrumbs)
                     @foreach($breadCrumbs as $parentPage)
                     @endforeach
                 @endif
             </div>
-            <h1>{{$page->name}}</h1>
-            @if(count($page->children) > 0)
-                <h4 class="text-muted">Sub-pages</h4>
-                <div class="page-list">
-                    @foreach($page->children as $childPage)
-                        <a href="{{ $childPage->getUrl() }}">{{ $childPage->name }}</a>
-                    @endforeach
-                </div>
-            @endif
-            {!! $page->html !!}
         </div>
     </div>
 
+    <div class="page-content">
+        <h1>{{$page->name}}</h1>
+        @if(count($page->children) > 0)
+            <h4 class="text-muted">Sub-pages</h4>
+            <div class="page-list">
+                @foreach($page->children as $childPage)
+                    <a href="{{ $childPage->getUrl() }}">{{ $childPage->name }}</a>
+                @endforeach
+            </div>
+        @endif
+        {!! $page->html !!}
+    </div>
+
+
     <script>
         $(document).ready(function() {
 
-            // Set up fixed side menu
-            $('.page-menu').affix({
-                offset: {
-                    top: 10,
-                    bottom: function () {
-                        return (this.bottom = $('.footer').outerHeight(true))
-                    }
-                }
-            });
-
             // Set up document navigation
             var pageNav = $('.page-nav-list');
             var pageContent = $('.page-content');