Skip to content

Merging feature/rename branch into master branch #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mariyan-dimitrov wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Merging feature/rename branch into master branch #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6c9aca
Update assets update reporting; move tools in /tools folder
xavortm May 25, 2019
34084ce
Revert changed assets version and bump project version
xavortm Jun 10, 2019
b9bc9c5
Gulp setup: "Optimize Fonts" task is added into "default" and "watch"…
mariyan-dimitrov Aug 6, 2019
56d420f
Removed unused libraries ( "gulp-filter", "replace-in-file", "v" )
mariyan-dimitrov Aug 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 23 additions & 47 deletions assets/dist/css/master.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/dist/css/master.css.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/dist/css/master.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/dist/css/master.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/dist/scripts/bundle.min.js
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ gulp.task("watch", function() {
gulp.watch(paths.source.sass + "**/*.scss", gulp.series("sass"));
gulp.watch(paths.source.scripts + "**/*.js", gulp.series("minifyScripts"));
gulp.watch(paths.source.images + "*", gulp.series("optimizeImages"));
gulp.watch(paths.source.fonts + "*", gulp.series("optimizeFonts"));


// Once the CSS file is build, minify it.
gulp.watch(paths.destination.css + "master.css", gulp.series("cssmin"));
Expand Down Expand Up @@ -121,7 +123,7 @@ gulp.task("optimizeImages", function() {
});

gulp.task("optimizeFonts", function() {
gulp
return gulp
.src(paths.source.fonts + "*")
.pipe(gulp.dest(paths.destination.fonts));
});
Expand Down Expand Up @@ -152,7 +154,8 @@ gulp.task("default",
gulp.parallel("minifyScripts",
"cssmin",
"optimizeImages",
"updateAssets"),
"updateAssets",
"optimizeFonts"),
"watch"
)
);
Expand Down
6 changes: 4 additions & 2 deletions inc/theme-version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php

/**
* AUTOGENERATED FILE, DO NOT EDIT
*
Expand All @@ -11,7 +10,10 @@
*
* Do not edit the line which defines "DX_ASSETS_VERSION" as it's being targeted
* with a REGEX expression from root/index.js file.
*
* @package WordPress
*/

if ( ! defined( 'DX_ASSETS_VERSION' ) ) {
define( 'DX_ASSETS_VERSION', '00000000-0' );
define( 'DX_ASSETS_VERSION', '20190806-8' );
}
Loading