Merge pull request #1 from holger1411/master

Bringing fork up to date.

.gitignore

@@ -11,3 +11,5 @@ dist
 dist-product
 
 npm-debug.log
+
+/vendor/

404.php

@@ -6,16 +6,21 @@
  */
 
 get_header();
+
+$container   = get_theme_mod( 'understrap_container_type' );
+$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
+
 ?>
+
 <div class="wrapper" id="404-wrapper">
 
-	<div class="container" id="content">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">
 
-			<div class="content-area" id="primary">
+			<div class="col-md-12 content-area" id="primary">
 
-				<main class="site-main" id="main" role="main">
+				<main class="site-main" id="main">
 
 					<section class="error-404 not-found">
 
@@ -74,7 +79,7 @@ get_header();
 
 			</div><!-- #primary -->
 
-		</div> <!-- .row -->
+		</div><!-- .row -->
 
 	</div><!-- Container end -->
 

CHANGELOG.md

@@ -1,4 +1,19 @@
-            
+
+            - ** Release 0.6.1 May 18th 2017 **
+               - Replacing some older BS3 markup - Thx @typeplus and @Kostas Vrouvas
+               - Add basic error handling for `gulp-plumber` - thx @L422Y
+               - Correcting woo commerce customer login markup
+               - Replacing cssnano with minify-css
+               - Fix deprecated product accessor for WooCommerce 3.0 - Thx @willgorham
+               - Declare woocommerce support - Thx @typeplus
+               - Adding norwegian translation files - Thx @joakimhellum
+               - Adding info for GitHub updater plugin
+               - Fixing imagemin task
+               - Specify correct post templates for jetpack infinite scroll - Thx @typeplus
+               - Streamline 404.php and aligning with other page templates
+               - Adding gulp-sequence
+
+
             - ** Release 0.6.0 (skipping 0.5.8 and 0.5.9 ) Apr. 21th 2017 **
                - Adding WooCommerce 3.0.0 support - Big thx @typeplus
                - Add npm-debug.log to .gitignore file - thx @OussamaElgoumri

archive.php

@@ -17,7 +17,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 <div class="wrapper" id="archive-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">
 

author.php

@@ -15,7 +15,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 <div class="wrapper" id="author-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">
 
@@ -41,7 +41,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 						<?php if ( ! empty( $curauth->user_url ) ) : ?>
 							<dt><?php esc_html_e( 'Website', 'understrap' ); ?></dt>
 							<dd>
-								<a href="<?php echo esc_html( $curauth->user_url ); ?>"><?php echo esc_html( $curauth->user_url ); ?></a>
+								<a href="<?php echo esc_url( $curauth->user_url ); ?>"><?php echo esc_html( $curauth->user_url ); ?></a>
 							</dd>
 						<?php endif; ?>
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "understrap",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "homepage": "http://understrap.com",
   "authors": [
     "Holger Koenemann <office@holgerkoenemann.de>"
@@ -26,6 +26,6 @@
   "dependencies": {
   },
   "_source": "https://github.com/holger1411/understrap.git",
-  "_target": "~0.6.0",
+  "_target": "~0.6.2",
   "_originalSource": "understrap"
 }

composer.json

@@ -0,0 +1,10 @@
+{
+    "name": "holger1411/understrap",
+    "description": "Combines Automattic´s Underscores Starter Theme and Bootstrap 4",
+    "type": "library",
+    "license": "GPL-2.0",
+    "minimum-stability": "stable",
+    "require": {},
+    "keywords": ["wordpress","theme","bootstrap"],
+    "homepage": "https://github.com/holger1411/understrap"
+}

css/theme.css

@@ -6780,13 +6780,15 @@ a.text-gray-dark:focus, a.text-gray-dark:hover {
 .screen-reader-text {
   font-size: inherit; }
 
-.alignright {
-  float: right;
-  padding-left: 10px; }
-
 .alignleft {
+  display: inline;
   float: left;
-  padding-right: 10px; }
+  margin-right: 1.5em; }
+
+.alignright {
+  display: inline;
+  float: right;
+  margin-left: 1.5em; }
 
 .aligncenter {
   margin: 0px auto; }

footer.php

@@ -15,7 +15,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 <div class="wrapper" id="wrapper-footer">
 
-	<div class="<?php echo esc_html( $container ); ?>">
+	<div class="<?php echo esc_attr( $container ); ?>">
 
 		<div class="row">
 

gulpfile.js

@@ -42,6 +42,7 @@ var sourcemaps = require('gulp-sourcemaps');
 var browserSync = require('browser-sync').create();
 var del = require('del');
 var cleanCSS = require('gulp-clean-css');
+var gulpSequence = require('gulp-sequence');
 
 
 // Run:
@@ -98,7 +99,7 @@ gulp.task('watch-scss', ['browser-sync'], function () {
 // Run:
 // gulp sass
 // Compiles SCSS files in CSS
-gulp.task('sass', ['minify-css'], function () {
+gulp.task('sass', function () {
     var stream = gulp.src('./sass/*.scss')
         .pipe(plumber({
             errorHandler: function (err) {
@@ -117,8 +118,7 @@ gulp.task('sass', ['minify-css'], function () {
 // gulp watch
 // Starts watcher. Watcher runs gulp sass task on changes
 gulp.task('watch', function () {
-    gulp.watch('./sass/**/*.scss', ['sass']);
+    gulp.watch('./sass/**/*.scss', ['styles']);
-    gulp.watch('./css/theme.css', ['minify-css']);
     gulp.watch([basePaths.dev + 'js/**/*.js','js/**/*.js','!js/theme.js','!js/theme.min.js'], ['scripts']);
 
     //Inside the watch task.
@@ -155,7 +155,8 @@ gulp.task('cssnano', function(){
 
 gulp.task('minify-css', function() {
   return gulp.src('./css/theme.css')
-    .pipe(cleanCSS({compatibility: 'ie8'}))
+  .pipe(sourcemaps.init({loadMaps: true}))
+    .pipe(cleanCSS({compatibility: '*'}))
     .pipe(plumber({
             errorHandler: function (err) {
                 console.log(err);
@@ -163,6 +164,7 @@ gulp.task('minify-css', function() {
             }
         }))
     .pipe(rename({suffix: '.min'}))
+     .pipe(sourcemaps.write('./'))
     .pipe(gulp.dest('./css/'));
 });
 
@@ -172,6 +174,8 @@ gulp.task('cleancss', function() {
     .pipe(rimraf());
 });
 
+gulp.task('styles', function(callback){ gulpSequence('sass', 'minify-css')(callback) });
+ 
 
 // Run:
 // gulp browser-sync
@@ -184,7 +188,7 @@ gulp.task('browser-sync', function() {
 // Run:
 // gulp watch-bs
 // Starts watcher with browser-sync. Browser-sync reloads page automatically on your browser
-gulp.task('watch-bs', ['browser-sync', 'watch', 'minify-css', 'scripts'], function () { });
+gulp.task('watch-bs', ['browser-sync', 'watch', 'scripts'], function () { });
 
 
 // Run: 

inc/bootstrap-wp-navwalker.php

@@ -64,9 +64,9 @@ class WP_Bootstrap_Navwalker extends Walker_Nav_Menu {
 		} else if ( strcasecmp( $item->title, 'divider' ) == 0 && $depth === 1 ) {
 			$output .= $indent . '<li class="divider" role="presentation">';
 		} else if ( strcasecmp( $item->attr_title, 'dropdown-header' ) == 0 && $depth === 1 ) {
-			$output .= $indent . '<li class="dropdown-header" role="presentation">' . esc_attr( $item->title );
+			$output .= $indent . '<li class="dropdown-header" role="presentation">' . esc_html( $item->title );
 		} else if ( strcasecmp( $item->attr_title, 'disabled' ) == 0 ) {
-			$output .= $indent . '<li class="disabled" role="presentation"><a href="#">' . esc_attr( $item->title ) . '</a>';
+			$output .= $indent . '<li class="disabled" role="presentation"><a href="#">' . esc_html( $item->title ) . '</a>';
 		} else {
 			$class_names = $value = '';
 			$classes     = empty( $item->classes ) ? array() : (array) $item->classes;

inc/pagination.php

@@ -53,7 +53,7 @@ function understrap_pagination() {
 
 		/**    Previous Post Link */
 		if ( get_previous_posts_link() ) {
-			printf( '<li class="page-item"><span class="page-link">%1$s</span></li> ' . "\n",
+			printf( '<li class="page-item page-item-direction page-item-prev"><span class="page-link">%1$s</span></li> ' . "\n",
 			get_previous_posts_link( '<span aria-hidden="true">&laquo;</span><span class="sr-only">Previous page</span>' ) );
 		}
 
@@ -72,7 +72,7 @@ function understrap_pagination() {
 
 	// Next Post Link.
 	if ( get_next_posts_link() ) {
-		printf( '<li class="page-item"><span class="page-link">%s</span></li>' . "\n",
+		printf( '<li class="page-item page-item-direction page-item-next"><span class="page-link">%s</span></li>' . "\n",
 			get_next_posts_link( '<span aria-hidden="true">&raquo;</span><span class="sr-only">Next page</span>' ) );
 	}
 

inc/widgets.php

@@ -9,39 +9,40 @@
  * Count number of widgets in a sidebar
  * Used to add classes to widget areas so widgets can be displayed one, two, three or four per row
  */
-function slbd_count_widgets( $sidebar_id ) {
+if ( ! function_exists( 'slbd_count_widgets' ) ) {
-	// If loading from front page, consult $_wp_sidebars_widgets rather than options
+	function slbd_count_widgets( $sidebar_id ) {
-	// to see if wp_convert_widget_settings() has made manipulations in memory.
+		// If loading from front page, consult $_wp_sidebars_widgets rather than options
-	global $_wp_sidebars_widgets;
+		// to see if wp_convert_widget_settings() has made manipulations in memory.
-	if ( empty( $_wp_sidebars_widgets ) ) :
+		global $_wp_sidebars_widgets;
-		$_wp_sidebars_widgets = get_option( 'sidebars_widgets', array() );
+		if ( empty( $_wp_sidebars_widgets ) ) :
-	endif;
+			$_wp_sidebars_widgets = get_option( 'sidebars_widgets', array() );
-	
+		endif;
-	$sidebars_widgets_count = $_wp_sidebars_widgets;
-	
-	if ( isset( $sidebars_widgets_count[ $sidebar_id ] ) ) :
-		$widget_count = count( $sidebars_widgets_count[ $sidebar_id ] );
-		$widget_classes = 'widget-count-' . count( $sidebars_widgets_count[ $sidebar_id ] );
-		if ( $widget_count % 4 == 0 || $widget_count > 6 ) :
-			// Four widgets er row if there are exactly four or more than six
-			$widget_classes .= ' col-md-3';
-		elseif ( 6 == $widget_count ) :
-			// If two widgets are published
-			$widget_classes .= ' col-md-2';
-		elseif ( $widget_count >= 3 ) :
-			// Three widgets per row if there's three or more widgets 
-			$widget_classes .= ' col-md-4';
-		elseif ( 2 == $widget_count ) :
-			// If two widgets are published
-			$widget_classes .= ' col-md-6';
-		elseif ( 1 == $widget_count ) :
-			// If just on widget is active
-			$widget_classes .= ' col-md-12';
-		endif; 
-		return $widget_classes;
-	endif;
-}
 
+		$sidebars_widgets_count = $_wp_sidebars_widgets;
+
+		if ( isset( $sidebars_widgets_count[ $sidebar_id ] ) ) :
+			$widget_count = count( $sidebars_widgets_count[ $sidebar_id ] );
+			$widget_classes = 'widget-count-' . count( $sidebars_widgets_count[ $sidebar_id ] );
+			if ( $widget_count % 4 == 0 || $widget_count > 6 ) :
+				// Four widgets er row if there are exactly four or more than six
+				$widget_classes .= ' col-md-3';
+			elseif ( 6 == $widget_count ) :
+				// If two widgets are published
+				$widget_classes .= ' col-md-2';
+			elseif ( $widget_count >= 3 ) :
+				// Three widgets per row if there's three or more widgets 
+				$widget_classes .= ' col-md-4';
+			elseif ( 2 == $widget_count ) :
+				// If two widgets are published
+				$widget_classes .= ' col-md-6';
+			elseif ( 1 == $widget_count ) :
+				// If just on widget is active
+				$widget_classes .= ' col-md-12';
+			endif; 
+			return $widget_classes;
+		endif;
+	}
+}
 
 if ( ! function_exists( 'understrap_widgets_init' ) ) {
 	/**

index.php

@@ -23,7 +23,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 <div class="wrapper" id="wrapper-index">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "understrap",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Wordpress Theme framework",
   "main": "index.js",
   "scripts": {
@@ -28,10 +28,11 @@
   "homepage": "https://understrap.com",
   "dependencies": {
     "bootstrap": "^4.0.0-alpha.6",
-    "browser-sync": "^2.18.8",
+    "browser-sync": "^2.18.11",
     "del": "^2.2.2",
     "font-awesome": "^4.7.0",
     "gulp": "^3.9.1",
+    "gulp-clean-css": "^3.3.1",
     "gulp-clone": "^1.0.0",
     "gulp-concat": "^2.6.1",
     "gulp-cssnano": "^2.1.2",
@@ -42,14 +43,12 @@
     "gulp-rename": "^1.2.2",
     "gulp-rimraf": "^0.2.1",
     "gulp-sass": "^3.1.0",
-    "gulp-sourcemaps": "2.4.1",
+    "gulp-sourcemaps": "2.6.0",
     "gulp-uglify": "^2.1.2",
     "gulp-watch": "^4.3.11",
     "merge2": "^1.0.3",
     "run-sequence": "^1.2.2",
-    "gulp-clean-css": "^3.0.4",
+    "gulp-sequence": "^0.4.6",
     "undescores-for-npm": "^1.0.0"
-  },
-  "devDependencies": {
   }
 }

page-templates/both-sidebarspage.php

@@ -13,7 +13,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 <div class="wrapper" id="page-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content">
 
 		<div class="row">
 

page-templates/fullwidthpage.php

@@ -13,7 +13,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 <div class="wrapper" id="full-width-page-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content">
 
 		<div class="row">
 

page-templates/left-sidebarpage.php

@@ -13,7 +13,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 <div class="wrapper" id="page-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content">
 
 		<div class="row">
 

page-templates/right-sidebarpage.php

@@ -13,7 +13,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 <div class="wrapper" id="page-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content">
 
 		<div class="row">
 

page.php

@@ -19,7 +19,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 <div class="wrapper" id="page-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">
 

sass/theme.scss

@@ -6,7 +6,6 @@
 @import "assets/font-awesome"; // <------- Font Awesome Icon font
 @import "assets/underscores"; // <------- Underscores media styles
 
-
 // Any additional imported files //
 @import "theme/theme";  // <--------- Thats where you can add your own design. Thats your part!
 @import "theme/contact-form7"; // contact form 7 - Bootatrap 4 support

sass/understrap/understrap.scss

@@ -26,14 +26,16 @@
 
 .screen-reader-text { font-size: inherit; }
 
-.alignright {
+.alignleft {
-  float: right;
+  display: inline;
-  padding-left: 10px;
+  float: left;
+  margin-right: 1.5em;
 }
 
-.alignleft {
+.alignright {
-  float: left;
+  display: inline;
-  padding-right: 10px;
+  float: right;
+  margin-left: 1.5em;
 }
 
 .aligncenter { margin: 0px auto; }

search.php

@@ -13,7 +13,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 <div class="wrapper" id="search-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">
 

sidebar-footerfull.php

@@ -15,7 +15,7 @@ $container   = get_theme_mod( 'understrap_container_type' );
 
 	<div class="wrapper" id="wrapper-footer-full">
 
-		<div class="<?php echo esc_html( $container ); ?>" id="footer-full-content" tabindex="-1">
+		<div class="<?php echo esc_attr( $container ); ?>" id="footer-full-content" tabindex="-1">
 
 			<div class="row">
 

sidebar-statichero.php

@@ -15,7 +15,7 @@ $container   = get_theme_mod( 'understrap_container_type' );
 
 	<div class="wrapper" id="wrapper-static-hero">
 
-			<div class="<?php echo esc_html( $container ); ?>" id="wrapper-static-content" tabindex="-1">
+			<div class="<?php echo esc_attr( $container ); ?>" id="wrapper-static-content" tabindex="-1">
 
 				<div class="row">
 

single.php

@@ -12,7 +12,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 <div class="wrapper" id="single-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">
 

style.css

@@ -8,7 +8,7 @@ Description: Combination of Automattic´s _s theme and Bootstrap 4. Made as a so
 That downloads everything and moves it in place so that you can recompile your CSS and JS files;
 A developer version (with Gulp/node and Sass sources) is available on gitHub: https://github.com/holger1411/understrap
 A child theme is available on Github, too: https://github.com/holger1411/understrap-child;
-Version: 0.6.0
+Version: 0.6.2
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: understrap

woocommerce.php

@@ -19,7 +19,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 <div class="wrapper" id="woocommerce-wrapper">
 
-	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
+	<div class="<?php echo esc_attr( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">
 

woocommerce/cart/cart.php

@@ -56,7 +56,7 @@ do_action( 'woocommerce_before_cart' ); ?>
 								echo apply_filters( 'woocommerce_cart_item_remove_link', sprintf(
 									'<a href="%s" class="remove" aria-label="%s" data-product_id="%s" data-product_sku="%s">&times;</a>',
 									esc_url( WC()->cart->get_remove_url( $cart_item_key ) ),
-									__( 'Remove this item', 'understrap' ),
+									esc_attr__( 'Remove this item', 'understrap' ),
 									esc_attr( $product_id ),
 									esc_attr( $_product->get_sku() )
 								), $cart_item_key );

woocommerce/cart/mini-cart.php

@@ -46,7 +46,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 						echo apply_filters( 'woocommerce_cart_item_remove_link', sprintf(
 							'<a href="%s" class="remove" title="%s" data-product_id="%s" data-product_sku="%s">&times;</a>',
 							esc_url( WC()->cart->get_remove_url( $cart_item_key ) ),
-							__( 'Remove this item', 'understrap' ),
+							esc_attr__( 'Remove this item', 'understrap' ),
 							esc_attr( $product_id ),
 							esc_attr( $_product->get_sku() )
 						), $cart_item_key );