From 75ecf1c44de98bc1f8e7b5b88c12c3f248011daf Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 13 Mar 2016 12:43:42 +0000 Subject: [PATCH] Fixed inset chapter list colors The colors were being overridden by the custom theme color. Styles added to force color to page and/or page draft. --- resources/assets/sass/_lists.scss | 3 +++ resources/assets/sass/_text.scss | 6 ++++++ resources/views/chapters/list-item.blade.php | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss index e0ba2ae42..679443313 100644 --- a/resources/assets/sass/_lists.scss +++ b/resources/assets/sass/_lists.scss @@ -16,6 +16,9 @@ margin: $-s 0 0 0; border-left: 5px solid $color-page; padding: $-xs 0 $-xs $-m; + &.draft { + border-left-color: $color-page-draft; + } } hr { margin-top: 0; diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss index f76fa4d01..721eeb238 100644 --- a/resources/assets/sass/_text.scss +++ b/resources/assets/sass/_text.scss @@ -206,6 +206,12 @@ p.secondary, p .secondary, span.secondary, .text-secondary { &:hover { color: $color-page; } + &.draft { + color: $color-page-draft; + } + &.draft:hover { + color: $color-page-draft; + } } .text-chapter { color: $color-chapter; diff --git a/resources/views/chapters/list-item.blade.php b/resources/views/chapters/list-item.blade.php index beaf1cac2..d5ac46338 100644 --- a/resources/views/chapters/list-item.blade.php +++ b/resources/views/chapters/list-item.blade.php @@ -14,7 +14,7 @@

{{ count($chapter->pages) }} Pages

@foreach($chapter->pages as $page) -

{{$page->name}}

+

{{$page->name}}

@endforeach
@endif