diff --git a/README.md b/README.md index 2b49d98..c5e63be 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,8 @@ All Sass files are located within ``/assets/scss``, with the ``style.scss`` outp ###### Default task All JavaScript files are located with ``/assets/js``, the ``scripts.js`` file is the main Javascript file for the theme, with external third party libraries within the ``vendor`` folder. All files within this will be concatenated into the ``dist/main.js`` file and ``dist/main.min.js`` +The scripts task will also run the main JavaScript file through Babel, which means you can use all the new ES2015, ES2016 etc. features without fear of them not working in some older browsers! + * ``/assets/js/scripts.js`` is the main JavaScript file. This is where you should write all of your JavaScript. * ``/assets/js/dist/main.js`` is the uncompressed and concatenated JavaScript file from all of the files within the ``/assets/js/vendor/*.js`` folder and ``/assets/js/scripts.js`` file. * ``/assets/js/dist/main.min.js`` is our compressed version of the ``/assets/js/dist/main.js`` file. diff --git a/assets/img/favicon/android-icon-144x144.png b/assets/img/favicon/android-icon-144x144.png index 9b79eb2..00584b1 100644 Binary files a/assets/img/favicon/android-icon-144x144.png and b/assets/img/favicon/android-icon-144x144.png differ diff --git a/assets/img/favicon/android-icon-192x192.png b/assets/img/favicon/android-icon-192x192.png index 9a915af..6a21039 100644 Binary files a/assets/img/favicon/android-icon-192x192.png and b/assets/img/favicon/android-icon-192x192.png differ diff --git a/assets/img/favicon/android-icon-36x36.png b/assets/img/favicon/android-icon-36x36.png index b2b8805..0a21253 100644 Binary files a/assets/img/favicon/android-icon-36x36.png and b/assets/img/favicon/android-icon-36x36.png differ diff --git a/assets/img/favicon/android-icon-48x48.png b/assets/img/favicon/android-icon-48x48.png index 67e0214..06cd350 100644 Binary files a/assets/img/favicon/android-icon-48x48.png and b/assets/img/favicon/android-icon-48x48.png differ diff --git a/assets/img/favicon/android-icon-72x72.png b/assets/img/favicon/android-icon-72x72.png index 9b4e2a3..8687588 100644 Binary files a/assets/img/favicon/android-icon-72x72.png and b/assets/img/favicon/android-icon-72x72.png differ diff --git a/assets/img/favicon/android-icon-96x96.png b/assets/img/favicon/android-icon-96x96.png index 9613938..6dd7cc0 100644 Binary files a/assets/img/favicon/android-icon-96x96.png and b/assets/img/favicon/android-icon-96x96.png differ diff --git a/assets/img/favicon/apple-icon-114x114.png b/assets/img/favicon/apple-icon-114x114.png index ee1c80d..e7eaf21 100644 Binary files a/assets/img/favicon/apple-icon-114x114.png and b/assets/img/favicon/apple-icon-114x114.png differ diff --git a/assets/img/favicon/apple-icon-120x120.png b/assets/img/favicon/apple-icon-120x120.png index bda45de..aab42c2 100644 Binary files a/assets/img/favicon/apple-icon-120x120.png and b/assets/img/favicon/apple-icon-120x120.png differ diff --git a/assets/img/favicon/apple-icon-144x144.png b/assets/img/favicon/apple-icon-144x144.png index 9b79eb2..00584b1 100644 Binary files a/assets/img/favicon/apple-icon-144x144.png and b/assets/img/favicon/apple-icon-144x144.png differ diff --git a/assets/img/favicon/apple-icon-152x152.png b/assets/img/favicon/apple-icon-152x152.png index 0aa89b8..8349973 100644 Binary files a/assets/img/favicon/apple-icon-152x152.png and b/assets/img/favicon/apple-icon-152x152.png differ diff --git a/assets/img/favicon/apple-icon-180x180.png b/assets/img/favicon/apple-icon-180x180.png index a1e279b..8683b6d 100644 Binary files a/assets/img/favicon/apple-icon-180x180.png and b/assets/img/favicon/apple-icon-180x180.png differ diff --git a/assets/img/favicon/apple-icon-57x57.png b/assets/img/favicon/apple-icon-57x57.png index 645982b..ef9618c 100644 Binary files a/assets/img/favicon/apple-icon-57x57.png and b/assets/img/favicon/apple-icon-57x57.png differ diff --git a/assets/img/favicon/apple-icon-60x60.png b/assets/img/favicon/apple-icon-60x60.png index 410e66c..e024128 100644 Binary files a/assets/img/favicon/apple-icon-60x60.png and b/assets/img/favicon/apple-icon-60x60.png differ diff --git a/assets/img/favicon/apple-icon-72x72.png b/assets/img/favicon/apple-icon-72x72.png index 9b4e2a3..8687588 100644 Binary files a/assets/img/favicon/apple-icon-72x72.png and b/assets/img/favicon/apple-icon-72x72.png differ diff --git a/assets/img/favicon/apple-icon-76x76.png b/assets/img/favicon/apple-icon-76x76.png index 817a108..0b73fdf 100644 Binary files a/assets/img/favicon/apple-icon-76x76.png and b/assets/img/favicon/apple-icon-76x76.png differ diff --git a/assets/img/favicon/apple-icon-precomposed.png b/assets/img/favicon/apple-icon-precomposed.png index f69a007..003ae93 100644 Binary files a/assets/img/favicon/apple-icon-precomposed.png and b/assets/img/favicon/apple-icon-precomposed.png differ diff --git a/assets/img/favicon/apple-icon.png b/assets/img/favicon/apple-icon.png index f69a007..003ae93 100644 Binary files a/assets/img/favicon/apple-icon.png and b/assets/img/favicon/apple-icon.png differ diff --git a/assets/img/favicon/favicon-16x16.png b/assets/img/favicon/favicon-16x16.png index 66165f9..88d400b 100644 Binary files a/assets/img/favicon/favicon-16x16.png and b/assets/img/favicon/favicon-16x16.png differ diff --git a/assets/img/favicon/favicon-32x32.png b/assets/img/favicon/favicon-32x32.png index 29be598..f368eb6 100644 Binary files a/assets/img/favicon/favicon-32x32.png and b/assets/img/favicon/favicon-32x32.png differ diff --git a/assets/img/favicon/favicon-96x96.png b/assets/img/favicon/favicon-96x96.png index 9613938..6dd7cc0 100644 Binary files a/assets/img/favicon/favicon-96x96.png and b/assets/img/favicon/favicon-96x96.png differ diff --git a/assets/img/favicon/favicon.ico b/assets/img/favicon/favicon.ico index 9553022..333073a 100644 Binary files a/assets/img/favicon/favicon.ico and b/assets/img/favicon/favicon.ico differ diff --git a/assets/img/favicon/manifest.json b/assets/img/favicon/manifest.json index 013d4a6..cd404c2 100644 --- a/assets/img/favicon/manifest.json +++ b/assets/img/favicon/manifest.json @@ -1,5 +1,8 @@ { "name": "App", + "start_url": "/?homescreen=1", + "display": "standalone", + "theme_color": "#2c3346", "icons": [ { "src": "\/android-icon-36x36.png", diff --git a/assets/img/favicon/ms-icon-144x144.png b/assets/img/favicon/ms-icon-144x144.png index 9b79eb2..00584b1 100644 Binary files a/assets/img/favicon/ms-icon-144x144.png and b/assets/img/favicon/ms-icon-144x144.png differ diff --git a/assets/img/favicon/ms-icon-150x150.png b/assets/img/favicon/ms-icon-150x150.png index 9c5ebd8..827b493 100644 Binary files a/assets/img/favicon/ms-icon-150x150.png and b/assets/img/favicon/ms-icon-150x150.png differ diff --git a/assets/img/favicon/ms-icon-310x310.png b/assets/img/favicon/ms-icon-310x310.png index 002cb7c..1ba0c5a 100644 Binary files a/assets/img/favicon/ms-icon-310x310.png and b/assets/img/favicon/ms-icon-310x310.png differ diff --git a/assets/img/favicon/ms-icon-70x70.png b/assets/img/favicon/ms-icon-70x70.png index 76495b7..6b8db1e 100644 Binary files a/assets/img/favicon/ms-icon-70x70.png and b/assets/img/favicon/ms-icon-70x70.png differ diff --git a/assets/img/halo-logo.png b/assets/img/halo-logo.png deleted file mode 100644 index 8023fa9..0000000 Binary files a/assets/img/halo-logo.png and /dev/null differ diff --git a/gulpfile.js b/gulpfile.js index ebdc713..e250909 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -13,6 +13,8 @@ var concat = require('gulp-concat'); var imagemin = require('gulp-imagemin'); var prefix = require('gulp-autoprefixer'); var svgstore = require('gulp-svgstore'); +var sourcemaps = require('gulp-sourcemaps'); +var babel = require('gulp-babel'); /** * @function variables @@ -49,6 +51,9 @@ var autoprefixerOptions = { */ gulp.task('scripts', function () { return gulp.src([jsFiles, mainJSFile]) + .pipe(babel({ + presets: ['env'] + })) .pipe(plumber()) .pipe(concat(outputJSFile)) // output main JavaScript file without uglify .pipe(gulp.dest(outputJSFileLocation)) @@ -65,6 +70,7 @@ gulp.task('scripts', function () { */ gulp.task('styles', function () { return gulp.src(mainSassFile) + .pipe(sourcemaps.init()) .pipe(sass({ includePaths: ['scss'], onError: browserSync.notify @@ -72,6 +78,7 @@ gulp.task('styles', function () { .pipe(prefix(autoprefixerOptions, { cascade: true })) .pipe(plumber()) .pipe(concat(outputCSSFile)) // output main CSS file without cleanCSS + .pipe(sourcemaps.write('./maps')) .pipe(gulp.dest(outputCSSFileLocation)) .pipe(cleanCSS()) .pipe(concat(outputCSSFileCompressed)) // output main CSS file w/ cleanCSS @@ -90,6 +97,8 @@ gulp.task('browser-sync', ['scripts', 'styles'], function () { files: [ "*.php", '**/*.php', + '*.twig', + '**/*.twig', 'gulpfile.js', outputJSFileLocation + '/*.js', outputCSSFileLocation + '/*.css' diff --git a/package.json b/package.json index b557a79..4e7ad5d 100644 --- a/package.json +++ b/package.json @@ -24,14 +24,19 @@ "author": "Ben Brehaut", "license": "MIT", "devDependencies": { + "babel-core": "^6.26.0", + "babel-loader": "^7.1.2", + "babel-preset-env": "^1.6.0", "browser-sync": "^2.18.12", "gulp": "^3.8.8", "gulp-autoprefixer": "4.0.0", + "gulp-babel": "^7.0.0", "gulp-clean-css": "^3.6.0", "gulp-concat": "^2.6.1", "gulp-imagemin": "^3.3.0", "gulp-plumber": "^1.1.0", "gulp-sass": "^3.1.0", + "gulp-sourcemaps": "^2.6.1", "gulp-svgmin": "^1.2.4", "gulp-svgstore": "^6.1.0", "gulp-uglify": "^3.0.0"