From a761db175da33ea8f3600704b7946365ca0f3e25 Mon Sep 17 00:00:00 2001 From: koenemann Date: Tue, 28 Nov 2017 08:52:50 +0100 Subject: [PATCH] Regarding to https://themes.trac.wordpress.org/ticket/48576#comment:5 --- gulpfile.js | 12 ++++-------- inc/editor.php | 2 +- inc/setup.php | 2 +- package.json | 3 +-- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 1eadcac..3cf502f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -229,12 +229,12 @@ gulp.task('copy-assets', ['clean-source'], function() { ////////////////// All Bootstrap 4 Assets ///////////////////////// // Copy all JS files - var stream = gulp.src(basePaths.node + 'bootstrap/dist/js/**/*.js') - .pipe(gulp.dest(basePaths.dev + '/js/bootstrap4')); + //var stream = gulp.src(basePaths.node + 'bootstrap/dist/js/**/*.js') + // .pipe(gulp.dest(basePaths.dev + '/js/bootstrap4')); // Copy all Bootstrap SCSS files - gulp.src(basePaths.node + 'bootstrap/scss/**/*.scss') - .pipe(gulp.dest(basePaths.dev + '/sass/bootstrap4')); + //gulp.src(basePaths.node + 'bootstrap/scss/**/*.scss') + // .pipe(gulp.dest(basePaths.dev + '/sass/bootstrap4')); ////////////////// End Bootstrap 4 Assets ///////////////////////// @@ -246,10 +246,6 @@ gulp.task('copy-assets', ['clean-source'], function() { gulp.src(basePaths.node + 'font-awesome/scss/*.scss') .pipe(gulp.dest(basePaths.dev + '/sass/fontawesome')); -// Copy jQuery - gulp.src(basePaths.node + 'jquery/dist/*.js') - .pipe(gulp.dest(basePaths.js)); - // _s SCSS files gulp.src(basePaths.node + 'undescores-for-npm/sass/**/*.scss') .pipe(gulp.dest(basePaths.dev + '/sass/underscores')); diff --git a/inc/editor.php b/inc/editor.php index b9a8e52..1672cae 100644 --- a/inc/editor.php +++ b/inc/editor.php @@ -8,7 +8,7 @@ /** * Registers an editor stylesheet for the theme. */ -function wpdocs_theme_add_editor_styles() { +function understrap_wpdocs_theme_add_editor_styles() { add_editor_style( 'css/custom-editor-style.css' ); } add_action( 'admin_init', 'wpdocs_theme_add_editor_styles' ); diff --git a/inc/setup.php b/inc/setup.php index 2de4666..7822303 100644 --- a/inc/setup.php +++ b/inc/setup.php @@ -116,7 +116,7 @@ if ( ! function_exists( 'understrap_all_excerpts_get_more_link' ) ) { */ function understrap_all_excerpts_get_more_link( $post_excerpt ) { - return $post_excerpt . ' [...]

' . __( 'Read More...', + return $post_excerpt . ' [...]

' . __( 'Read More...', 'understrap' ) . '

'; } } diff --git a/package.json b/package.json index 77cc1fa..7a7516d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "understrap", - "version": "0.6.7", + "version": "0.6.8", "description": "WordPress Theme framework", "main": "index.js", "scripts": { @@ -47,7 +47,6 @@ "gulp-sourcemaps": "2.6.1", "gulp-uglify": "^3.0.0", "gulp-watch": "^4.3.11", - "jquery": "3.2.1", "merge2": "^1.2.0", "popper.js": "^1.12.6", "run-sequence": "^2.2.0",