Skip to content
This repository has been archived by the owner on May 28, 2022. It is now read-only.

Commit

Permalink
Merge pull request #215 from peiche/v1.4.1
Browse files Browse the repository at this point in the history
v1.4.1
  • Loading branch information
peiche authored May 5, 2021
2 parents c5106cb + b08b518 commit 77e85d1
Show file tree
Hide file tree
Showing 12 changed files with 51 additions and 34 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Change Log

## 1.4.1 - 05/03/2021

### Changed

- Added post navigation to all custom templates.
- Fixed excerpt color contrast on Cover template.
- Normalized hero sizes the same across Hero Header and Inset Hero Header templates.
- Fixed Inset Hero Header template's negative margin for small screen sizes.

## 1.4.0 - 04/30/2021

### New
Expand Down
38 changes: 19 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "garrick",
"version": "1.4.0",
"version": "1.4.1",
"description": "Garrick is a modern, responsive theme.",
"author": "Paul Eiche",
"license": "GPL-2.0+",
Expand Down Expand Up @@ -50,7 +50,7 @@
"rimraf": "^3.0.2",
"sass": "^1.32.12",
"sass-loader": "^11.0.1",
"stylelint": "^13.13.0",
"stylelint": "^13.13.1",
"stylelint-scss": "^3.19.0",
"svg-spritemap-webpack-plugin": "^3.9.1",
"theme-claim": "^0.2.0",
Expand Down
16 changes: 6 additions & 10 deletions resources/scss/components/_entry.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,9 @@
width: 100%;
}

.template--hero-header & {
max-height: 60vh;
}

.template--hero-header &,
.template--hero-inset-header & {
height: 200px;

@include breakpoints.breakpoint(md) {
height: 400px;
}
max-height: 60vh;
}

.template--cover-header & {
Expand All @@ -91,11 +84,14 @@
}

.template--hero-inset-header & {
margin-top: calc(-1 * var(--space-xxl));
background-color: var(--color-bg);
padding: var(--space-sm) var(--space-md) 0 var(--space-md);
margin-left: calc(-1 * var(--space-md));
margin-right: calc(-1 * var(--space-md));

@include breakpoints.breakpoint(sm) {
margin-top: calc(-1 * var(--space-xxl));
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions resources/views/partials/post-header.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
endif;
?>

<header class="entry__header entry__header--single <?php echo $cover_image ? 'alignfull flex items-center margin-bottom-md' : 'margin-y-lg' ?>">
<header class="entry__header entry__header--single<?php echo $cover_image ? ' alignfull flex items-center margin-bottom-md' : ' margin-y-lg' ?>">
<div class="<?php echo $cover_image ? 'container max-width-sm margin-top-xxxl margin-bottom-xl' : 'margin-bottom-md' ?>">
<?php Hybrid\Post\display_title( [ 'class' => 'entry__title text-xxl text-xxxl@md' ] ) ?>

<?php $post_content_excerpt = preg_split( '/<!--more(.*?)?-->/', get_post()->post_content ); ?>
<?php if ( has_excerpt() && strcasecmp( trim( get_the_excerpt() ), trim( $post_content_excerpt[0] ) ) != 0 ) : ?>
<div class="entry__excerpt margin-bottom-sm text-md color-contrast-medium">
<div class="entry__excerpt margin-bottom-sm text-md<?php echo $cover_image ? '' : ' color-contrast-medium' ?>">
<?php the_excerpt() ?>
</div>
<?php endif; ?>
Expand Down
2 changes: 2 additions & 0 deletions resources/views/template/cover-header.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
</div>
</div>

<?php Hybrid\View\display( 'partials', 'post-navigation' ) ?>

<?php endwhile ?>

<?php endif ?>
Expand Down
2 changes: 2 additions & 0 deletions resources/views/template/full-width.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
</div>
</div>

<?php Hybrid\View\display( 'partials', 'post-navigation' ) ?>

<?php endwhile ?>

<?php endif ?>
Expand Down
2 changes: 2 additions & 0 deletions resources/views/template/hero-header.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
</div>
</div>

<?php Hybrid\View\display( 'partials', 'post-navigation' ) ?>

<?php endwhile ?>

<?php endif ?>
Expand Down
2 changes: 2 additions & 0 deletions resources/views/template/hero-inset-header.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
</div>
</div>

<?php Hybrid\View\display( 'partials', 'post-navigation' ) ?>

<?php endwhile ?>

<?php endif ?>
Expand Down
2 changes: 2 additions & 0 deletions resources/views/template/no-header.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
</div>
</div>

<?php Hybrid\View\display( 'partials', 'post-navigation' ) ?>

<?php endwhile ?>

<?php endif ?>
Expand Down
2 changes: 2 additions & 0 deletions resources/views/template/no-image.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
</div>
</div>

<?php Hybrid\View\display( 'partials', 'post-navigation' ) ?>

<?php endwhile ?>

<?php endif ?>
Expand Down
2 changes: 1 addition & 1 deletion style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Theme Name: Garrick
* Theme URI: https://boldoak.design/work/garrick
* Description: Starter WordPress theme.
* Version: 1.4.0
* Version: 1.4.1
* Author: Paul Eiche
* Author URI: https://boldoak.design
* Tags: custom-background, custom-colors, custom-menu, featured-images, one-column, post-formats, rtl-language-support, theme-options, threaded-comments, translation-ready
Expand Down

0 comments on commit 77e85d1

Please sign in to comment.