Merge remote-tracking branch 'origin/master'

# Conflicts:
#	css/theme.css
#	css/theme.min.css
#	css/theme.min.css.map
This commit is contained in:
Holger Könemann 2018-12-28 09:43:13 +01:00
commit aa90bee3e3
3 changed files with 28 additions and 23 deletions

View File

@ -98,7 +98,6 @@ if ( ! function_exists ( 'understrap_post_nav' ) ) {
<h2 class="sr-only"><?php _e( 'Post navigation', 'understrap' ); ?></h2> <h2 class="sr-only"><?php _e( 'Post navigation', 'understrap' ); ?></h2>
<div class="row nav-links justify-content-between"> <div class="row nav-links justify-content-between">
<?php <?php
if ( get_previous_post_link() ) { if ( get_previous_post_link() ) {
previous_post_link( '<span class="nav-previous">%link</span>', _x( '<i class="fa fa-angle-left"></i>&nbsp;%title', 'Previous post link', 'understrap' ) ); previous_post_link( '<span class="nav-previous">%link</span>', _x( '<i class="fa fa-angle-left"></i>&nbsp;%title', 'Previous post link', 'understrap' ) );
} }
@ -108,7 +107,6 @@ if ( ! function_exists ( 'understrap_post_nav' ) ) {
?> ?>
</div><!-- .nav-links --> </div><!-- .nav-links -->
</nav><!-- .navigation --> </nav><!-- .navigation -->
<?php <?php
} }
} }

View File

@ -7,3 +7,10 @@
figure.woocommerce-product-gallery__wrapper { figure.woocommerce-product-gallery__wrapper {
max-width: inherit !important; max-width: inherit !important;
} }
// Fix coupon code input width
@media(min-width: 768px) {
#coupon_code.input-text {
width: 110px !important;
}
}