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

Merge pull request #965 from kelsS/master 

Removed bower.json and updated fullwidthpage.php - Thx @kelsS !
This commit is contained in:
Holger 2019-05-08 14:30:01 +02:00 committed by GitHub
parent 1e90d3c65f b179eaffe4
commit a09fcbecf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 270 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.browserslistrc Normal file
View File

@ -0,0 +1,10 @@
# please see https://github.com/browserslist/browserslist for more info
# These settings can be changed depending on what browsers your project is supporting
>= 0.01%
Last 5 versions
last 8 iOS versions
Firefox >= 28
IE 10 # sorry
IE 11 # sorry
dead # sorry

31
bower.json
View File

@ -1,31 +0,0 @@
{
"name": "understrap",
"version": "0.9.1",
"homepage": "http://understrap.com",
"authors": [
"Holger Koenemann <office@holgerkoenemann.de>"
],
"description": "UnderStrap is a Bootstrap and underscores based WordPress theme framework.",
"moduleType": "globals",
"main": [
"sass/theme.scss"
],
"keywords": [
"bootstrap",
"underscores",
"wordpress",
"_s",
"sass"
],
"license": "GPL-2.0",
"ignore": [
"**/.*",
"test",
"tests"
],
"dependencies": {
},
"_source": "https://github.com/holger1411/understrap.git",
"_target": "~0.9.0",
"_originalSource": "understrap"
}

180
gulpfile.js
View File

@ -2,6 +2,8 @@
var gulp = require('gulp'); var gulp = require('gulp');
var plumber = require('gulp-plumber'); var plumber = require('gulp-plumber');
var sass = require('gulp-sass'); var sass = require('gulp-sass');
var babel = require('gulp-babel');
var postcss = require('gulp-postcss');
var watch = require('gulp-watch'); var watch = require('gulp-watch');
var rename = require('gulp-rename'); var rename = require('gulp-rename');
var concat = require('gulp-concat'); var concat = require('gulp-concat');
@ -15,7 +17,7 @@ var del = require( 'del' );
var cleanCSS = require('gulp-clean-css'); var cleanCSS = require('gulp-clean-css');
var gulpSequence = require('gulp-sequence'); var gulpSequence = require('gulp-sequence');
var replace = require('gulp-replace'); var replace = require('gulp-replace');
var autoprefixer = require( 'gulp-autoprefixer' ); var autoprefixer = require('autoprefixer');
// Configuration file to keep your code DRY // Configuration file to keep your code DRY
var cfg = require('./gulpconfig.json'); var cfg = require('./gulpconfig.json');
@ -25,18 +27,21 @@ var paths = cfg.paths;
// gulp sass // gulp sass
// Compiles SCSS files in CSS // Compiles SCSS files in CSS
gulp.task('sass', function() { gulp.task('sass', function() {
var stream = gulp.src( paths.sass + '/*.scss' ) var stream = gulp
.pipe( plumber( { .src(paths.sass + '/*.scss')
.pipe(
plumber({
errorHandler: function(err) { errorHandler: function(err) {
console.log(err); console.log(err);
this.emit('end'); this.emit('end');
} }
} ) ) })
)
.pipe(sourcemaps.init({ loadMaps: true })) .pipe(sourcemaps.init({ loadMaps: true }))
.pipe(sass({ errLogToConsole: true })) .pipe(sass({ errLogToConsole: true }))
.pipe( autoprefixer( 'last 2 versions' ) ) .pipe(postcss([autoprefixer()]))
.pipe(sourcemaps.write(undefined, { sourceRoot: null })) .pipe(sourcemaps.write(undefined, { sourceRoot: null }))
.pipe( gulp.dest( paths.css ) ) .pipe(gulp.dest(paths.css));
return stream; return stream;
}); });
@ -45,7 +50,15 @@ gulp.task( 'sass', function() {
// Starts watcher. Watcher runs gulp sass task on changes // Starts watcher. Watcher runs gulp sass task on changes
gulp.task('watch', function() { gulp.task('watch', function() {
gulp.watch(`${paths.sass}/**/*.scss`, gulp.series('styles')); gulp.watch(`${paths.sass}/**/*.scss`, gulp.series('styles'));
gulp.watch( [`${paths.dev}/js/**/*.js`, 'js/**/*.js', '!js/theme.js', '!js/theme.min.js'], gulp.series('scripts') ); gulp.watch(
[
`${paths.dev}/js/**/*.js`,
'js/**/*.js',
'!js/theme.js',
'!js/theme.min.js'
],
gulp.series('scripts')
);
//Inside the watch task. //Inside the watch task.
gulp.watch(`${paths.imgsrc}/**`, gulp.series('imagemin-watch')); gulp.watch(`${paths.imgsrc}/**`, gulp.series('imagemin-watch'));
@ -55,7 +68,8 @@ gulp.task( 'watch', function() {
// gulp imagemin // gulp imagemin
// Running image optimizing task // Running image optimizing task
gulp.task('imagemin', function() { gulp.task('imagemin', function() {
gulp.src( `${paths.imgsrc}/**` ) gulp
.src(`${paths.imgsrc}/**`)
.pipe(imagemin()) .pipe(imagemin())
.pipe(gulp.dest(paths.img)); .pipe(gulp.dest(paths.img));
}); });
@ -64,22 +78,28 @@ gulp.task( 'imagemin', function() {
* Ensures the 'imagemin' task is complete before reloading browsers * Ensures the 'imagemin' task is complete before reloading browsers
* @verbose * @verbose
*/ */
gulp.task( 'imagemin-watch', gulp.series('imagemin', function( ) { gulp.task(
'imagemin-watch',
gulp.series('imagemin', function() {
browserSync.reload(); browserSync.reload();
})); })
);
// Run: // Run:
// gulp cssnano // gulp cssnano
// Minifies CSS files // Minifies CSS files
gulp.task('cssnano', function() { gulp.task('cssnano', function() {
return gulp.src( paths.css + '/theme.css' ) return gulp
.src(paths.css + '/theme.css')
.pipe(sourcemaps.init({ loadMaps: true })) .pipe(sourcemaps.init({ loadMaps: true }))
.pipe( plumber( { .pipe(
plumber({
errorHandler: function(err) { errorHandler: function(err) {
console.log(err); console.log(err);
this.emit('end'); this.emit('end');
} }
} ) ) })
)
.pipe(rename({ suffix: '.min' })) .pipe(rename({ suffix: '.min' }))
.pipe(cssnano({ discardComments: { removeAll: true } })) .pipe(cssnano({ discardComments: { removeAll: true } }))
.pipe(sourcemaps.write('./')) .pipe(sourcemaps.write('./'))
@ -87,22 +107,26 @@ gulp.task( 'cssnano', function() {
}); });
gulp.task('minifycss', function() { gulp.task('minifycss', function() {
return gulp.src( `${paths.css}/theme.css` ) return gulp
.src(`${paths.css}/theme.css`)
.pipe(sourcemaps.init({ loadMaps: true })) .pipe(sourcemaps.init({ loadMaps: true }))
.pipe(cleanCSS({ compatibility: '*' })) .pipe(cleanCSS({ compatibility: '*' }))
.pipe( plumber( { .pipe(
plumber({
errorHandler: function(err) { errorHandler: function(err) {
console.log(err); console.log(err);
this.emit('end'); this.emit('end');
} }
} ) ) })
)
.pipe(rename({ suffix: '.min' })) .pipe(rename({ suffix: '.min' }))
.pipe(sourcemaps.write('./')) .pipe(sourcemaps.write('./'))
.pipe(gulp.dest(paths.css)); .pipe(gulp.dest(paths.css));
}); });
gulp.task('cleancss', function() { gulp.task('cleancss', function() {
return gulp.src( `${paths.css}/*.min.css`, { read: false } ) // Much faster return gulp
.src(`${paths.css}/*.min.css`, { read: false }) // Much faster
.pipe(ignore('theme.css')) .pipe(ignore('theme.css'))
.pipe(rimraf()); .pipe(rimraf());
}); });
@ -123,7 +147,6 @@ gulp.task( 'browser-sync', function() {
// Uglifies and concat all JS files into one // Uglifies and concat all JS files into one
gulp.task('scripts', function() { gulp.task('scripts', function() {
var scripts = [ var scripts = [
// Start - All BS4 stuff // Start - All BS4 stuff
`${paths.dev}/js/bootstrap4/bootstrap.bundle.js`, `${paths.dev}/js/bootstrap4/bootstrap.bundle.js`,
@ -135,12 +158,16 @@ gulp.task( 'scripts', function() {
// Please add any customizations to this .js file only! // Please add any customizations to this .js file only!
`${paths.dev}/js/custom-javascript.js` `${paths.dev}/js/custom-javascript.js`
]; ];
gulp.src( scripts, { allowEmpty: true } ) gulp
.src(scripts, { allowEmpty: true })
.pipe(babel())
.pipe(concat('theme.min.js')) .pipe(concat('theme.min.js'))
.pipe(uglify()) .pipe(uglify())
.pipe(gulp.dest(paths.js)); .pipe(gulp.dest(paths.js));
return gulp.src( scripts, { allowEmpty: true } ) return gulp
.src(scripts, { allowEmpty: true })
.pipe(babel())
.pipe(concat('theme.js')) .pipe(concat('theme.js'))
.pipe(gulp.dest(paths.js)); .pipe(gulp.dest(paths.js));
}); });
@ -161,32 +188,37 @@ gulp.task( 'watch-bs', gulp.parallel('browser-sync', 'watch'));
////////////////// All Bootstrap SASS Assets ///////////////////////// ////////////////// All Bootstrap SASS Assets /////////////////////////
gulp.task('copy-assets', function(done) { gulp.task('copy-assets', function(done) {
////////////////// All Bootstrap 4 Assets ///////////////////////// ////////////////// All Bootstrap 4 Assets /////////////////////////
// Copy all JS files // Copy all JS files
var stream = gulp.src( `${paths.node}bootstrap/dist/js/**/*.js` ) var stream = gulp
.src(`${paths.node}bootstrap/dist/js/**/*.js`)
.pipe(gulp.dest(`${paths.dev}/js/bootstrap4`)); .pipe(gulp.dest(`${paths.dev}/js/bootstrap4`));
// Copy all Bootstrap SCSS files // Copy all Bootstrap SCSS files
gulp.src( `${paths.node}bootstrap/scss/**/*.scss` ) gulp
.src(`${paths.node}bootstrap/scss/**/*.scss`)
.pipe(gulp.dest(`${paths.dev}/sass/bootstrap4`)); .pipe(gulp.dest(`${paths.dev}/sass/bootstrap4`));
////////////////// End Bootstrap 4 Assets ///////////////////////// ////////////////// End Bootstrap 4 Assets /////////////////////////
// Copy all Font Awesome Fonts // Copy all Font Awesome Fonts
gulp.src( `${paths.node}font-awesome/fonts/**/*.{ttf,woff,woff2,eot,svg}` ) gulp
.src(`${paths.node}font-awesome/fonts/**/*.{ttf,woff,woff2,eot,svg}`)
.pipe(gulp.dest('./fonts')); .pipe(gulp.dest('./fonts'));
// Copy all Font Awesome SCSS files // Copy all Font Awesome SCSS files
gulp.src( `${paths.node}font-awesome/scss/*.scss` ) gulp
.src(`${paths.node}font-awesome/scss/*.scss`)
.pipe(gulp.dest(`${paths.dev}/sass/fontawesome`)); .pipe(gulp.dest(`${paths.dev}/sass/fontawesome`));
// _s SCSS files // _s SCSS files
gulp.src( `${paths.node}undescores-for-npm/sass/media/*.scss` ) gulp
.src(`${paths.node}undescores-for-npm/sass/media/*.scss`)
.pipe(gulp.dest(`${paths.dev}/sass/underscores`)); .pipe(gulp.dest(`${paths.dev}/sass/underscores`));
// _s JS files into /src/js // _s JS files into /src/js
gulp.src( `${paths.node}undescores-for-npm/js/skip-link-focus-fix.js` ) gulp
.src(`${paths.node}undescores-for-npm/js/skip-link-focus-fix.js`)
.pipe(gulp.dest(`${paths.dev}/js`)); .pipe(gulp.dest(`${paths.dev}/js`));
done(); done();
@ -194,7 +226,18 @@ gulp.task( 'copy-assets', function(done) {
// Deleting the files distributed by the copy-assets task // Deleting the files distributed by the copy-assets task
gulp.task('clean-vendor-assets', function() { gulp.task('clean-vendor-assets', function() {
return del( [`${paths.dev}/js/bootstrap4/**`, `${paths.dev}/sass/bootstrap4/**`, './fonts/*wesome*.{ttf,woff,woff2,eot,svg}', `${paths.dev}/sass/fontawesome/**`, `${paths.dev}/sass/underscores/**`, `${paths.dev}/js/skip-link-focus-fix.js`, `${paths.js}/**/skip-link-focus-fix.js`, `${paths.js}/**/popper.min.js`, `${paths.js}/**/popper.js`, ( paths.vendor !== ''?( paths.js + paths.vendor + '/**' ):'' )] ); return del([
`${paths.dev}/js/bootstrap4/**`,
`${paths.dev}/sass/bootstrap4/**`,
'./fonts/*wesome*.{ttf,woff,woff2,eot,svg}',
`${paths.dev}/sass/fontawesome/**`,
`${paths.dev}/sass/underscores/**`,
`${paths.dev}/js/skip-link-focus-fix.js`,
`${paths.js}/**/skip-link-focus-fix.js`,
`${paths.js}/**/popper.min.js`,
`${paths.js}/**/popper.js`,
paths.vendor !== '' ? paths.js + paths.vendor + '/**' : ''
]);
}); });
// Deleting any file inside the /dist folder // Deleting any file inside the /dist folder
@ -205,13 +248,61 @@ gulp.task( 'clean-dist', function() {
// Run // Run
// gulp dist // gulp dist
// Copies the files to the /dist folder for distribution as simple theme // Copies the files to the /dist folder for distribution as simple theme
gulp.task( 'dist', gulp.series(['clean-dist'], function() { gulp.task(
return gulp.src( ['**/*', `!${paths.bower}`, `!${paths.bower}/**`, `!${paths.node}`, `!${paths.node}/**`, `!${paths.dev}`, `!${paths.dev}/**`, `!${paths.dist}`, `!${paths.dist}/**`, `!${paths.distprod}`, `!${paths.distprod}/**`, `!${paths.sass}`, `!${paths.sass}/**`, '!readme.txt', '!readme.md', '!package.json', '!package-lock.json', '!gulpfile.js', '!gulpconfig.json', '!CHANGELOG.md', '!.travis.yml', '!jshintignore', '!codesniffer.ruleset.xml', '*'], { 'buffer': true } ) 'dist',
.pipe( replace( '/js/jquery.slim.min.js', '/js' + paths.vendor + '/jquery.slim.min.js', { 'skipBinary': true } ) ) gulp.series(['clean-dist'], function() {
.pipe( replace( '/js/popper.min.js', '/js' + paths.vendor + '/popper.min.js', { 'skipBinary': true } ) ) return gulp
.pipe( replace( '/js/skip-link-focus-fix.js', '/js' + paths.vendor + '/skip-link-focus-fix.js', { 'skipBinary': true } ) ) .src(
[
'**/*',
`!${paths.bower}`,
`!${paths.bower}/**`,
`!${paths.node}`,
`!${paths.node}/**`,
`!${paths.dev}`,
`!${paths.dev}/**`,
`!${paths.dist}`,
`!${paths.dist}/**`,
`!${paths.distprod}`,
`!${paths.distprod}/**`,
`!${paths.sass}`,
`!${paths.sass}/**`,
'!readme.txt',
'!readme.md',
'!package.json',
'!package-lock.json',
'!gulpfile.js',
'!gulpconfig.json',
'!CHANGELOG.md',
'!.travis.yml',
'!jshintignore',
'!codesniffer.ruleset.xml',
'*'
],
{ buffer: true }
)
.pipe(
replace(
'/js/jquery.slim.min.js',
'/js' + paths.vendor + '/jquery.slim.min.js',
{ skipBinary: true }
)
)
.pipe(
replace('/js/popper.min.js', '/js' + paths.vendor + '/popper.min.js', {
skipBinary: true
})
)
.pipe(
replace(
'/js/skip-link-focus-fix.js',
'/js' + paths.vendor + '/skip-link-focus-fix.js',
{ skipBinary: true }
)
)
.pipe(gulp.dest(paths.dist)); .pipe(gulp.dest(paths.dist));
})); })
);
// Deleting any file inside the /dist-product folder // Deleting any file inside the /dist-product folder
gulp.task('clean-dist-product', function() { gulp.task('clean-dist-product', function() {
@ -221,10 +312,25 @@ gulp.task( 'clean-dist-product', function() {
// Run // Run
// gulp dist-product // gulp dist-product
// Copies the files to the /dist-prod folder for distribution as theme with all assets // Copies the files to the /dist-prod folder for distribution as theme with all assets
gulp.task( 'dist-product', gulp.series(['clean-dist-product'], function() { gulp.task(
return gulp.src( ['**/*', `!${paths.bower}`, `!${paths.bower}/**`, `!${paths.node}`, `!${paths.node}/**`, `!${paths.dist}`, `!${paths.dist}/**`, `!${paths.distprod}`, `!${paths.distprod}/**`, '*'] ) 'dist-product',
gulp.series(['clean-dist-product'], function() {
return gulp
.src([
'**/*',
`!${paths.bower}`,
`!${paths.bower}/**`,
`!${paths.node}`,
`!${paths.node}/**`,
`!${paths.dist}`,
`!${paths.dist}/**`,
`!${paths.distprod}`,
`!${paths.distprod}/**`,
'*'
])
.pipe(gulp.dest(paths.distprod)); .pipe(gulp.dest(paths.distprod));
} )); })
);
// Run // Run
// gulp compile // gulp compile

6
package.json
View File

@ -48,5 +48,11 @@
"gulp-watch": "^5.0.1", "gulp-watch": "^5.0.1",
"run-sequence": "^2.2.1", "run-sequence": "^2.2.1",
"undescores-for-npm": "^1.0.0" "undescores-for-npm": "^1.0.0"
},
"devDependencies": {
"@babel/core": "^7.4.4",
"autoprefixer": "^9.5.1",
"gulp-babel": "^8.0.0",
"gulp-postcss": "^8.0.0"
} }
} }

5
page-templates/fullwidthpage.php
View File

@ -15,6 +15,11 @@ get_header();
$container = get_theme_mod( 'understrap_container_type' ); $container = get_theme_mod( 'understrap_container_type' );
?> ?>
<?php if ( is_front_page() ) : ?>
<?php get_template_part( 'global-templates/hero' ); ?>
<?php endif; ?>
<div class="wrapper" id="full-width-page-wrapper"> <div class="wrapper" id="full-width-page-wrapper">
<div class="<?php echo esc_attr( $container ); ?>" id="content"> <div class="<?php echo esc_attr( $container ); ?>" id="content">