{{ $book->name }}
+{{ $book->getExcerpt() }}
+diff --git a/resources/assets/sass/_blocks.scss b/resources/assets/sass/_blocks.scss index 1e4641338..b000c7ed6 100644 --- a/resources/assets/sass/_blocks.scss +++ b/resources/assets/sass/_blocks.scss @@ -180,9 +180,9 @@ padding: $-m; padding-bottom: $-xs; margin: 0; - font-size: $fs-s; - color: #444; - fill: #666; + font-size: $fs-m; + color: #222; + fill: #222; font-weight: 400; } h3 a { diff --git a/resources/assets/sass/_colors.scss b/resources/assets/sass/_colors.scss index 044a9498b..d89b26463 100644 --- a/resources/assets/sass/_colors.scss +++ b/resources/assets/sass/_colors.scss @@ -97,4 +97,8 @@ p.secondary, p .secondary, span.secondary, .text-secondary { .faded .text-page:hover { color: $color-page !important; fill: $color-page !important; +} + +.bg-book { + background-color: $color-book; } \ No newline at end of file diff --git a/resources/assets/sass/_grid.scss b/resources/assets/sass/_grid.scss index 0ee934b3f..0d0b38aca 100644 --- a/resources/assets/sass/_grid.scss +++ b/resources/assets/sass/_grid.scss @@ -59,13 +59,22 @@ body.flexbox { margin: $-m; } } -.flex.sidebar + .flex.content { +.flex.sidebar + .flex { flex: 3; + max-width: 100%; +} +.flex.sidebar + .flex .content-wrap { background-color: #FFFFFF; - padding: 0 $-l; + padding: $-l $-xxl; box-shadow: $bs-card; border-radius: 4px; - max-width: 100%; + margin-left: auto; + margin-right: auto; + overflow: auto; + &.thin { + width: 940px; + max-width: 100%; + } } .flex.sidebar .sidebar-toggle { display: none; diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss index a979363c0..ef3c59f4d 100644 --- a/resources/assets/sass/_lists.scss +++ b/resources/assets/sass/_lists.scss @@ -126,7 +126,7 @@ font-size: 0.8rem; } .entity-list-item.selected { - background-color: #EEE; + background-color: #F2F2F2; } .chapter-child-menu { font-size: 12px; @@ -293,6 +293,13 @@ a.entity-list-item:hover { background-color: #F2F2F2; } +.entity-list-item-image { + width: 140px; + background-size: cover; + background-position: 50% 50%; + border-radius: 3px; +} + .entity-list.compact { font-size: 0.6 * $fs-m; h4, a { diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss index bb604e188..3dfdce8a2 100755 --- a/resources/assets/sass/_pages.scss +++ b/resources/assets/sass/_pages.scss @@ -344,7 +344,6 @@ .comments-container { width: 100%; - border-top: 1px solid #DDD; margin-top: $-xl; margin-bottom: $-m; h5 { diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss index 900c677ff..43b3e5898 100644 --- a/resources/assets/sass/_text.scss +++ b/resources/assets/sass/_text.scss @@ -42,7 +42,7 @@ h1, h2, h3, h4, h5, h6 { font-weight: 400; position: relative; display: block; - color: #333; + color: #222; .subheader { font-size: 0.5em; line-height: 1em; @@ -79,6 +79,10 @@ h5, h6 { } } +.list-heading { + font-size: 2rem; +} + /* * Link styling */ diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss index ea0fcba5b..229480410 100644 --- a/resources/assets/sass/_variables.scss +++ b/resources/assets/sass/_variables.scss @@ -37,8 +37,8 @@ $text: -apple-system, BlinkMacSystemFont, sans-serif; $mono: "Lucida Console", "DejaVu Sans Mono", "Ubunto Mono", Monaco, monospace; $heading: $text; -$fs-m: 15px; -$fs-s: 14px; +$fs-m: 14px; +$fs-s: 12px; // Colours $primary: #0288D1; @@ -53,7 +53,7 @@ $primary-faded: rgba(21, 101, 192, 0.15); // Item Colors $color-bookshelf: #af5a5a; $color-book: #009688; -$color-chapter: #e56236; +$color-chapter: #d7804a; $color-page: $primary; $color-page-draft: #9A60DA; diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php index 84150203f..bed51e7fd 100644 --- a/resources/views/books/index.blade.php +++ b/resources/views/books/index.blade.php @@ -1,12 +1,10 @@ @extends('sidebar-layout') @section('toolbar') -