From 2c95528de4587212e03de67dacc7b90fc1ab27e9 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 21 Jul 2015 22:11:30 +0100 Subject: [PATCH] Started redesign --- resources/assets/sass/_forms.scss | 6 +-- resources/assets/sass/_html.scss | 2 +- resources/assets/sass/_tinymce.scss | 8 ++++ resources/assets/sass/styles.scss | 41 +++++++++++------ resources/views/base.blade.php | 34 +++++++------- resources/views/pages/edit.blade.php | 10 ++--- resources/views/pages/form.blade.php | 15 ++++--- resources/views/pages/show.blade.php | 66 +++++++++++++--------------- 8 files changed, 99 insertions(+), 83 deletions(-) diff --git a/resources/assets/sass/_forms.scss b/resources/assets/sass/_forms.scss index 861cfbb9f..c2755efe3 100644 --- a/resources/assets/sass/_forms.scss +++ b/resources/assets/sass/_forms.scss @@ -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; diff --git a/resources/assets/sass/_html.scss b/resources/assets/sass/_html.scss index 6b21a48a7..5071b3296 100644 --- a/resources/assets/sass/_html.scss +++ b/resources/assets/sass/_html.scss @@ -2,7 +2,7 @@ box-sizing: border-box; } html { - background-color: #f8f8f8; + background-color: #FFFFFF; } body { font-family: $text; diff --git a/resources/assets/sass/_tinymce.scss b/resources/assets/sass/_tinymce.scss index 9c7c398cf..10a3c0175 100644 --- a/resources/assets/sass/_tinymce.scss +++ b/resources/assets/sass/_tinymce.scss @@ -19,4 +19,12 @@ 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 diff --git a/resources/assets/sass/styles.scss b/resources/assets/sass/styles.scss index 0fd4f638d..421686db0 100644 --- a/resources/assets/sass/styles.scss +++ b/resources/assets/sass/styles.scss @@ -11,21 +11,40 @@ 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; } diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index 282b0d35e..bae7a4f2c 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -28,27 +28,29 @@
-
-
-
-
-
-
- -
-
- {!! csrf_field() !!} - -
-
+
+
+
+
+
+ +
+
+ {!! csrf_field() !!} + +
-
+ + +
@yield('content')
diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php index 30a27cb79..fee9782fd 100644 --- a/resources/views/pages/edit.blade.php +++ b/resources/views/pages/edit.blade.php @@ -8,12 +8,10 @@ @section('content') -
-
- - @include('pages/form', ['model' => $page]) -
-
+
+ + @include('pages/form', ['model' => $page]) +
@stop diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php index a100bdbca..4028998c9 100644 --- a/resources/views/pages/form.blade.php +++ b/resources/views/pages/form.blade.php @@ -1,14 +1,14 @@ -
-

You are editing a page

- -
-
+ +
{{ csrf_field() }} -
- @include('form/text', ['name' => 'name', 'placeholder' => 'Enter Page Title']) +
+ +
+ @include('form/text', ['name' => 'name', 'placeholder' => 'Enter Page Title']) +
@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", diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php index a5eac3c98..f623168f6 100644 --- a/resources/views/pages/show.blade.php +++ b/resources/views/pages/show.blade.php @@ -1,24 +1,24 @@ @extends('base') +@section('sidebar') +
+

Navigation

+
    +
    +
    +

    Actions

    +
    + Edit this page + Create Sub-page +
    +
    +@stop + @section('content')
    -
    -
    -

    Navigation

    -
      -
      -
      -

      Actions

      -
      - Edit this page - Create Sub-page -
      -
      -
      - -
      -
      +
      +
      {{ $book->name }} @if($breadCrumbs) @foreach($breadCrumbs as $parentPage) @@ -27,32 +27,26 @@ @endforeach @endif
      -

      {{$page->name}}

      - @if(count($page->children) > 0) -

      Sub-pages

      -
      - @foreach($page->children as $childPage) - {{ $childPage->name }} - @endforeach -
      - @endif - {!! $page->html !!}
      +
      +

      {{$page->name}}

      + @if(count($page->children) > 0) +

      Sub-pages

      +
      + @foreach($page->children as $childPage) + {{ $childPage->name }} + @endforeach +
      + @endif + {!! $page->html !!} +
      + +