rayelliott
/
understrap
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
parent 912ccf8edb f3c23d0a8b
commit aa90bee3e3
3 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/extras.php
View File

@ -74,7 +74,7 @@ if ( ! function_exists( 'understrap_change_logo_class' ) ) {
$html = str_replace( 'class="custom-logo"', 'class="img-fluid"', $html ); $html = str_replace( 'class="custom-logo"', 'class="img-fluid"', $html );
$html = str_replace( 'class="custom-logo-link"', 'class="navbar-brand custom-logo-link"', $html ); $html = str_replace( 'class="custom-logo-link"', 'class="navbar-brand custom-logo-link"', $html );
$html = str_replace( 'alt=""', 'title="Home" alt="logo"' , $html ); $html = str_replace( 'alt=""', 'title="Home" alt="logo"', $html );
return $html; return $html;
} }
@ -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
} }
} }

8
inc/template-tags.php
View File

@ -14,7 +14,7 @@ if ( ! defined( 'ABSPATH' ) ) {
/** /**
* Prints HTML with meta information for the current post-date/time and author. * Prints HTML with meta information for the current post-date/time and author.
*/ */
if ( ! function_exists ( 'understrap_posted_on' ) ) { if ( ! function_exists( 'understrap_posted_on' ) ) {
function understrap_posted_on() { function understrap_posted_on() {
$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>'; $time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) { if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
@ -50,7 +50,7 @@ if ( ! function_exists ( 'understrap_posted_on' ) ) {
/** /**
* Prints HTML with meta information for the categories, tags and comments. * Prints HTML with meta information for the categories, tags and comments.
*/ */
if ( ! function_exists ( 'understrap_entry_footer' ) ) { if ( ! function_exists( 'understrap_entry_footer' ) ) {
function understrap_entry_footer() { function understrap_entry_footer() {
// Hide category and tag text for pages. // Hide category and tag text for pages.
if ( 'post' === get_post_type() ) { if ( 'post' === get_post_type() ) {
@ -90,7 +90,7 @@ if ( ! function_exists ( 'understrap_entry_footer' ) ) {
* *
* @return bool * @return bool
*/ */
if ( ! function_exists ( 'understrap_categorized_blog' ) ) { if ( ! function_exists( 'understrap_categorized_blog' ) ) {
function understrap_categorized_blog() { function understrap_categorized_blog() {
if ( false === ( $all_the_cool_cats = get_transient( 'understrap_categories' ) ) ) { if ( false === ( $all_the_cool_cats = get_transient( 'understrap_categories' ) ) ) {
// Create an array of all the categories that are attached to posts. // Create an array of all the categories that are attached to posts.
@ -121,7 +121,7 @@ if ( ! function_exists ( 'understrap_categorized_blog' ) ) {
add_action( 'edit_category', 'understrap_category_transient_flusher' ); add_action( 'edit_category', 'understrap_category_transient_flusher' );
add_action( 'save_post', 'understrap_category_transient_flusher' ); add_action( 'save_post', 'understrap_category_transient_flusher' );
if ( ! function_exists ( 'understrap_category_transient_flusher' ) ) { if ( ! function_exists( 'understrap_category_transient_flusher' ) ) {
function understrap_category_transient_flusher() { function understrap_category_transient_flusher() {
if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) { if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
return; return;

7
sass/understrap/woocommerce.scss
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;
}
}