diff --git a/resources/assets/sass/_buttons.scss b/resources/assets/sass/_buttons.scss index 5e973a947..093da80ca 100644 --- a/resources/assets/sass/_buttons.scss +++ b/resources/assets/sass/_buttons.scss @@ -58,9 +58,6 @@ $button-border-radius: 2px; &.muted { @include generate-button-colors(#EEE, #AAA); } - &.muted-light { - @include generate-button-colors(#666, #e4e4e4); - } } .button + .button { diff --git a/resources/assets/sass/_forms.scss b/resources/assets/sass/_forms.scss index 0b69c0d5b..77ac35963 100644 --- a/resources/assets/sass/_forms.scss +++ b/resources/assets/sass/_forms.scss @@ -197,7 +197,7 @@ input[type=date] { } } .setting-list-label { - color: #444; + color: #222; font-size: 1rem; } .setting-list-label + p.small { diff --git a/resources/assets/sass/_grid.scss b/resources/assets/sass/_grid.scss index 31ad84e1e..7415be73f 100644 --- a/resources/assets/sass/_grid.scss +++ b/resources/assets/sass/_grid.scss @@ -257,7 +257,7 @@ div[class^="col-"] img { margin: 0 0 10px; } p { - font-size: .85em; + font-size: .7rem; margin: 0; line-height: 1.6em; } @@ -293,6 +293,9 @@ div[class^="col-"] img { .grid.half, .grid.left-focus, .grid.right-focus { grid-template-columns: 1fr; } + .grid.half.collapse-xs { + grid-template-columns: 1fr 1fr; + } .grid.large-gap { grid-column-gap: $-m; grid-row-gap: $-m; @@ -311,6 +314,12 @@ div[class^="col-"] img { } } +@include smaller-than($xs) { + .grid.half.collapse-xs { + grid-template-columns: 1fr; + } +} + .float { float: left; &.right { diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss index c6226f009..db057532d 100644 --- a/resources/assets/sass/_lists.scss +++ b/resources/assets/sass/_lists.scss @@ -462,6 +462,10 @@ ul.pagination { .featured-image-container { position: relative; overflow: hidden; + min-height: 140px; + background-size: cover; + background-position: 50% 50%; + transition: opacity ease-in-out 240ms; a { display: block; } @@ -470,11 +474,21 @@ ul.pagination { width: 100%; max-width: 100%; height: auto; - transition: all .5s ease-in-out; } } -.grid-card:hover .featured-image-container img { - transform: scale(1.15); +.featured-image-container-wrap { + position: relative; + .svg-icon { + color: #FFF; + fill: #FFF; + font-size: 2rem; + margin-right: 0; + position: absolute; + bottom: 10px; + left: 6px; + } +} +.grid-card:hover .featured-image-container { opacity: .5; } diff --git a/resources/views/auth/forms/login/standard.blade.php b/resources/views/auth/forms/login/standard.blade.php index 557ee8339..a12fbd753 100644 --- a/resources/views/auth/forms/login/standard.blade.php +++ b/resources/views/auth/forms/login/standard.blade.php @@ -5,6 +5,6 @@
{{ $book->getExcerpt(130) }}
@endif