From 505a22bc7b45f235b40fc983eb5ba89e8dd87d42 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 30 Aug 2015 17:53:30 +0100 Subject: [PATCH] Started another major redsign --- resources/assets/sass/_buttons.scss | 9 +- resources/assets/sass/_html.scss | 4 +- resources/assets/sass/_text.scss | 2 +- resources/assets/sass/_variables.scss | 11 ++- resources/assets/sass/styles.scss | 110 ++++++++-------------- resources/views/base.blade.php | 54 ++++++----- resources/views/books/show.blade.php | 59 ++++++------ resources/views/home.blade.php | 18 ++-- resources/views/pages/show.blade.php | 49 +++++----- resources/views/settings/navbar.blade.php | 13 ++- 10 files changed, 161 insertions(+), 168 deletions(-) diff --git a/resources/assets/sass/_buttons.scss b/resources/assets/sass/_buttons.scss index d9a45709b..df4712e32 100644 --- a/resources/assets/sass/_buttons.scss +++ b/resources/assets/sass/_buttons.scss @@ -14,7 +14,7 @@ } // Button Specific Variables -$button-border-radius: 3px; +$button-border-radius: 2px; .button-base { text-decoration: none; @@ -24,11 +24,14 @@ $button-border-radius: 3px; margin: $-xs $-xs $-xs 0; display: inline-block; border: none; + font-weight: 500; + font-family: $text; outline: 0; border-radius: $button-border-radius; cursor: pointer; - transition: all ease-in-out 80ms; - box-shadow: 0 0 0 0 #000; + transition: all ease-in-out 120ms; + text-transform: uppercase; + box-shadow: 0 0.5px 1.5px 0 rgba(0, 0, 0, 0.21); @include generate-button-colors(#EEE, $primary); } diff --git a/resources/assets/sass/_html.scss b/resources/assets/sass/_html.scss index 5071b3296..d8587aaf1 100644 --- a/resources/assets/sass/_html.scss +++ b/resources/assets/sass/_html.scss @@ -7,8 +7,8 @@ html { body { font-family: $text; font-size: $fs-m; - line-height: 1.4em; - color: #444; + line-height: 1.6; + color: #616161; -webkit-font-smoothing: antialiased; } diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss index 8d7950e2c..c9eabf792 100644 --- a/resources/assets/sass/_text.scss +++ b/resources/assets/sass/_text.scss @@ -28,7 +28,7 @@ h4 { } h1, h2, h3, h4 { - font-weight: 500; + font-weight: 400; position: relative; display: block; color: #555; diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss index 7e67e8a3d..d886dcfca 100644 --- a/resources/assets/sass/_variables.scss +++ b/resources/assets/sass/_variables.scss @@ -2,7 +2,7 @@ /////////////// // Sizes -$max-width: 1100px; +$max-width: 1400px; // Screen breakpoints $xl: 1100px; @@ -26,14 +26,15 @@ $-xxs: 3px; // Fonts $heading: 'Roboto', Helvetica, Arial, sans-serif; $text: 'Roboto', Helvetica, Arial, sans-serif; -$fs-m: 16px; +$fs-m: 15px; $fs-s: 14px; // Colours -$primary: #1c77c1; +$primary: #0288D1; +$primary-dark: #0288D1; $secondary: #e27b41; -$positive: #409945; -$negative: #D35252; +$positive: #52A256; +$negative: #D32F2F; // Text colours $text-dark: #444; diff --git a/resources/assets/sass/styles.scss b/resources/assets/sass/styles.scss index d6534789a..62d0e7ad1 100644 --- a/resources/assets/sass/styles.scss +++ b/resources/assets/sass/styles.scss @@ -16,83 +16,51 @@ header { display: block; z-index: 2; top: 0; + background-color: $primary-dark; + color: #fff; .padded { padding: $-m; } + border-bottom: 1px solid #DDD; //margin-bottom: $-l; -} - -#sidebar { - position: fixed; - background-color: #444; - color: #EEE; - height: 100%; - top: 0; - z-index: 1; - //padding-top: $-m; - width: 340px; - border-right: 1px solid #DDD; - h4, li, p, a { - color: #CCC; + .links a { + display: inline-block; + padding: $-l; + color: #FFF; + &:last-child { + padding-right: 0; + } + } + .search-box { + padding-top: $-l *0.8; + } + .avatar, .user-name { + display: inline-block; + } + .avatar { + margin-top: $-l*0.8; + } + .user-name { + vertical-align: top; + padding-top: $-l*1.1; + padding-left: $-m; } } #content { - //margin-top: 63px; - margin-left: 340px; display: block; position: relative; - padding: 0 16px; -} - -.logo-container { - padding: $-l $-s 0 $-s; - color: #CCC; - .logo { - display: block; - font-size: 2em; - font-weight: bold; - padding: $-m 0; - } - i { - padding-right: $-s; - } -} - -.user-overview { - margin-top: $-m; - .user-name { - display: inline-block; - vertical-align: top; - padding: $-m $-s; - } } -.search-box { - input { - width: 100%; - border-radius: 0; - padding: $-m; - background-color: rgba(0, 0, 0, 0.1); - border: none; - border-top: 1px solid #333; - border-bottom: 1px solid #333; - color: #EEE; - } -} - -.menu { - list-style: none; - margin: 0; - .col-md-4 { - padding: 0; - } - a { - padding: $-m; - display: block; - border-bottom: 1px solid #3A3939; - } +.logo { + display: inline-block; + font-size: 1.8em; + color: #fff; + font-weight: 400; + padding: $-l $-l $-l 0; + vertical-align: top; + line-height: 1; } .page-title input { @@ -259,10 +227,11 @@ h1, h2, h3, h4, h5, h6 { } .faded-small { - color: #666; + color: #000; font-size: 0.9em; + background-color: rgba(21, 101, 192, 0.15); a, span { - color: #666; + color: #000; } } @@ -271,6 +240,9 @@ h1, h2, h3, h4, h5, h6 { a { display: inline-block; padding: $-s; + &:last-child { + padding-right: 0; + } } } @@ -488,16 +460,14 @@ body.dragging, body.dragging * { } .setting-nav { - margin-top: $-l; - border-top: 1px solid #DDD; - border-bottom: 1px solid #DDD; + text-align: center; a { padding: $-m; display: inline-block; //color: #666; &.selected { //color: $primary; - background-color: #f8f8f8; + border-bottom: 2px solid $primary; } } } \ No newline at end of file diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index 4e1e74398..0e787d2ca 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -49,38 +49,40 @@ @endif - +
@yield('content') diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php index d80cc09e1..88db4b18d 100644 --- a/resources/views/books/show.blade.php +++ b/resources/views/books/show.blade.php @@ -2,31 +2,35 @@ @section('content') -
-
-
-
- @if($currentUser->can('page-create')) - New Page - @endif - @if($currentUser->can('chapter-create')) - New Chapter - @endif - @if($currentUser->can('book-update')) - Edit - Sort - @endif - @if($currentUser->can('book-delete')) - Delete - @endif +
+
+
+
+
+ @if($currentUser->can('page-create')) + New Page + @endif + @if($currentUser->can('chapter-create')) + New Chapter + @endif + @if($currentUser->can('book-update')) + Edit + Sort + @endif + @if($currentUser->can('book-delete')) + Delete + @endif +
+
-
-
-
+
+
+
+

{{$book->name}}

{{$book->description}}

@@ -51,7 +55,7 @@ @if(is_a($childElement, 'Oxbow\Chapter') && count($childElement->pages) > 0)
@foreach($childElement->pages as $page) -

{{$page->name}}

+

{{$page->name}}

@endforeach
@endif @@ -66,18 +70,19 @@ Last Updated {{$book->updated_at->diffForHumans()}} @if($book->createdBy) by {{$book->updatedBy->name}} @endif

+
-
- -
-

-

Recent Activity

- @include('partials/activity-list', ['activity' => Activity::entityActivity($book, 20, 0)]) +
+

+

Recent Activity

+ @include('partials/activity-list', ['activity' => Activity::entityActivity($book, 20, 0)]) +
+