Merge branch 'testing'

This commit is contained in:
koenemann 2016-01-08 14:07:02 +01:00
commit 828ef65169
9 changed files with 20 additions and 8 deletions

View File

@ -7,6 +7,15 @@ Website: http://understrap.com
Changelog
=
- **0.3.7 Jan. 8th 2016**
- Cleanup for submitting to WordPress.org theme repository:
- Fixing sticky post problem
- Fixing skip-to-content link
- re-activating the admin bar
- adding readme.txt
- Fixing missing translation strings in comments template
- **0.3.6 Jan. 4th 2016**
- Cleanup
- Updating dependencies

View File

@ -14,7 +14,7 @@
</header><!-- .entry-header -->
<?php echo get_the_post_thumbnail( $post_id, 'large' ); ?>
<?php echo get_the_post_thumbnail( $post->ID, 'large' ); ?>
<div class="entry-content">

View File

@ -18,7 +18,7 @@
</header><!-- .entry-header -->
<?php echo get_the_post_thumbnail( $post_id, 'large' ); ?>
<?php echo get_the_post_thumbnail( $post->ID, 'large' ); ?>
<div class="entry-content">

View File

@ -20,7 +20,7 @@
</header><!-- .entry-header -->
<?php echo get_the_post_thumbnail( $post_id, 'large' ); ?>
<?php echo get_the_post_thumbnail( $post->ID, 'large' ); ?>
<div class="entry-content">

View File

@ -5879,7 +5879,7 @@ button.close {
.entry-footer span {
padding-right: 10px; }
img.wp-post-image, article img {
img.wp-post-image, article img, figure {
max-width: 100%; }
a.skip-link {

2
css/theme.min.css vendored
View File

@ -1455,7 +1455,7 @@ td.visible-print,th.visible-print{display:table-cell!important}
#wrapper-hero,#wrapper-static-hero{padding:0!important}
.wrapper#wrapper-sticky{border-bottom:1px solid #eee}
.entry-footer span{padding-right:10px}
article img,img.wp-post-image{max-width:100%}
article img,figure,img.wp-post-image{max-width:100%}
a.skip-link{z-index:1000;margin-bottom:-20px;display:block}
.fa,.fa-stack{display:inline-block}
/*!

View File

@ -48,7 +48,11 @@ gulp.task('cleancss', function() {
gulp.task('copy-assets', function() {
gulp.src(basePaths.bower + 'bootstrap-sass/assets/javascripts/*.js')
.pipe(gulp.dest('./js'));
<<<<<<< HEAD
gulp.src(basePaths.bower + 'bootstrap-sass/assets/stylesheets/*.scss')
=======
gulp.src(basePaths.bower + 'bootstrap-sass/assets/stylesheets/**/*.scss')
>>>>>>> master
.pipe(gulp.dest('./sass/bootstrap-sass'));
gulp.src(basePaths.bower + 'bootstrap-sass/assets/fonts/bootstrap/*.{ttf,woff,woff2,eof,svg}')
.pipe(gulp.dest('./fonts'));

View File

@ -92,10 +92,9 @@ function custom_excerpt_more( $more ) {
add_filter( 'excerpt_more', 'custom_excerpt_more' );
/* Adds a custom read more link to all excerpts, manually or automatically generated */
add_theme_support( 'post-thumbnails' );
function all_excerpts_get_more_link($post_excerpt) {
return $post_excerpt . ' [...]<p><a class="btn btn-default understrap-read-more-link" href="'. get_permalink($post) . '">' . __('Read More...', 'understrap') . '</a></p>';
return $post_excerpt . ' [...]<p><a class="btn btn-default understrap-read-more-link" href="'. get_permalink( get_the_ID() ) . '">' . __('Read More...', 'understrap') . '</a></p>';
}
add_filter('wp_trim_excerpt', 'all_excerpts_get_more_link');

View File

@ -28,7 +28,7 @@ font-size:inherit;
.entry-footer span {padding-right:10px;}
//Limit featured image size to 100%
img.wp-post-image, article img {
img.wp-post-image, article img, figure {
max-width: 100%;
}