diff --git a/functions.php b/functions.php index ab4f0e7..300e541 100644 --- a/functions.php +++ b/functions.php @@ -1,4 +1,5 @@ { - return gulp.src(`${pathConfig.src.fonts}/**/*.{ttf, woff, woff2, svg, eot}`) + return gulp.src(`${pathConfig.src.fonts}/**/*`) .pipe(gulp.dest(pathConfig.assets.fonts)) } diff --git a/gulp/tasks/styles.js b/gulp/tasks/styles.js index fe3b2d6..6039523 100644 --- a/gulp/tasks/styles.js +++ b/gulp/tasks/styles.js @@ -8,6 +8,7 @@ import autoprefixer from 'gulp-autoprefixer'; import sourcemaps from 'gulp-sourcemaps'; import browser from 'browser-sync'; import pathConfig from '../paths.js' +import gcmq from 'gulp-group-css-media-queries'; export const stylesBuild = () => { return gulp.src(`${pathConfig.src.sass}/**/*.sass`, { @@ -17,8 +18,9 @@ export const stylesBuild = () => { .pipe(newer('*')) .pipe(gulpif(pathConfig.isDevelop, sourcemaps.init())) .pipe(sass.sync().on('error', sass.logError)) - .pipe(gulpif(pathConfig.isProd, cleanCSS({compatibility: 'ie8'}))) + .pipe(gulpif(pathConfig.isProd, gcmq())) .pipe(gulpif(pathConfig.isProd, autoprefixer())) + .pipe(gulpif(pathConfig.isProd, cleanCSS({ level: 2 }))) .pipe(gulpif(pathConfig.isDevelop, sourcemaps.write('./'))) .pipe(gulp.dest(pathConfig.assets.css)) diff --git a/package-lock.json b/package-lock.json index d6e1832..dd6b24b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "gulp-autoprefixer": "^7.0.1", "gulp-changed": "^4.0.2", "gulp-clean-css": "^4.3.0", + "gulp-group-css-media-queries": "^1.2.2", "gulp-header": "^2.0.9", "gulp-if": "^3.0.0", "gulp-imagemin": "^7.1.0", @@ -2019,6 +2020,40 @@ "source-map-resolve": "^0.6.0" } }, + "node_modules/css-parse": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz", + "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=", + "dev": true, + "dependencies": { + "css": "^2.0.0" + } + }, + "node_modules/css-parse/node_modules/css": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz", + "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "source-map": "^0.6.1", + "source-map-resolve": "^0.5.2", + "urix": "^0.1.0" + } + }, + "node_modules/css-parse/node_modules/source-map-resolve": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", + "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", + "dev": true, + "dependencies": { + "atob": "^2.1.2", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" + } + }, "node_modules/css-select": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", @@ -2039,6 +2074,40 @@ "dev": true, "optional": true }, + "node_modules/css-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/css-stringify/-/css-stringify-2.0.0.tgz", + "integrity": "sha1-LvM9z0mMPT7oK9c9CgGsKGKM0Po=", + "dev": true, + "dependencies": { + "css": "^2.0.0" + } + }, + "node_modules/css-stringify/node_modules/css": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz", + "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "source-map": "^0.6.1", + "source-map-resolve": "^0.5.2", + "urix": "^0.1.0" + } + }, + "node_modules/css-stringify/node_modules/source-map-resolve": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", + "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", + "dev": true, + "dependencies": { + "atob": "^2.1.2", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" + } + }, "node_modules/css-tree": { "version": "1.0.0-alpha.37", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz", @@ -7196,6 +7265,22 @@ "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", "dev": true }, + "node_modules/group-css-media-queries": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/group-css-media-queries/-/group-css-media-queries-1.4.1.tgz", + "integrity": "sha1-jlTLMcxFqcXgjrg4lAuKKAONcXU=", + "dev": true, + "dependencies": { + "css-parse": "^2.0.0", + "css-stringify": "^2.0.0" + }, + "bin": { + "group-css-media-queries": "bin/group-css-media-queries" + }, + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/gulp": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz", @@ -7440,6 +7525,30 @@ "node": ">=0.10.0" } }, + "node_modules/gulp-group-css-media-queries": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/gulp-group-css-media-queries/-/gulp-group-css-media-queries-1.2.2.tgz", + "integrity": "sha512-uOs8aJ5TV12aRstfc6pn107edDT2XSY7KNAU721Dz+gKHu/AUIlAaOdFdo9n/eHWqfb9QWMArrM8fiPOCqZPGg==", + "dev": true, + "dependencies": { + "group-css-media-queries": "^1.4.1", + "plugin-error": "^1.0.1", + "through2": "^2.0.3" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/gulp-group-css-media-queries/node_modules/through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "dev": true, + "dependencies": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + }, "node_modules/gulp-header": { "version": "2.0.9", "resolved": "https://registry.npmjs.org/gulp-header/-/gulp-header-2.0.9.tgz", @@ -21409,6 +21518,42 @@ "source-map-resolve": "^0.6.0" } }, + "css-parse": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz", + "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=", + "dev": true, + "requires": { + "css": "^2.0.0" + }, + "dependencies": { + "css": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz", + "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "source-map": "^0.6.1", + "source-map-resolve": "^0.5.2", + "urix": "^0.1.0" + } + }, + "source-map-resolve": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", + "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", + "dev": true, + "requires": { + "atob": "^2.1.2", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" + } + } + } + }, "css-select": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", @@ -21429,6 +21574,42 @@ "dev": true, "optional": true }, + "css-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/css-stringify/-/css-stringify-2.0.0.tgz", + "integrity": "sha1-LvM9z0mMPT7oK9c9CgGsKGKM0Po=", + "dev": true, + "requires": { + "css": "^2.0.0" + }, + "dependencies": { + "css": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz", + "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "source-map": "^0.6.1", + "source-map-resolve": "^0.5.2", + "urix": "^0.1.0" + } + }, + "source-map-resolve": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", + "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", + "dev": true, + "requires": { + "atob": "^2.1.2", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" + } + } + } + }, "css-tree": { "version": "1.0.0-alpha.37", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz", @@ -25675,6 +25856,16 @@ "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", "dev": true }, + "group-css-media-queries": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/group-css-media-queries/-/group-css-media-queries-1.4.1.tgz", + "integrity": "sha1-jlTLMcxFqcXgjrg4lAuKKAONcXU=", + "dev": true, + "requires": { + "css-parse": "^2.0.0", + "css-stringify": "^2.0.0" + } + }, "gulp": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz", @@ -25874,6 +26065,29 @@ "readable-stream": "^2.0.2" } }, + "gulp-group-css-media-queries": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/gulp-group-css-media-queries/-/gulp-group-css-media-queries-1.2.2.tgz", + "integrity": "sha512-uOs8aJ5TV12aRstfc6pn107edDT2XSY7KNAU721Dz+gKHu/AUIlAaOdFdo9n/eHWqfb9QWMArrM8fiPOCqZPGg==", + "dev": true, + "requires": { + "group-css-media-queries": "^1.4.1", + "plugin-error": "^1.0.1", + "through2": "^2.0.3" + }, + "dependencies": { + "through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "dev": true, + "requires": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + } + } + }, "gulp-header": { "version": "2.0.9", "resolved": "https://registry.npmjs.org/gulp-header/-/gulp-header-2.0.9.tgz", diff --git a/package.json b/package.json index d08d49f..166a4b1 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "gulp-autoprefixer": "^7.0.1", "gulp-changed": "^4.0.2", "gulp-clean-css": "^4.3.0", + "gulp-group-css-media-queries": "^1.2.2", "gulp-header": "^2.0.9", "gulp-if": "^3.0.0", "gulp-imagemin": "^7.1.0", @@ -36,5 +37,11 @@ "keywords": [], "author": "", "license": "ISC", - "type": "module" + "type": "module", + "browserslist": [ + "> 1%", + "last 2 versions", + "not dead", + "not IE 11" + ] } diff --git a/parts/quests/single/slider.php b/parts/quests/single/slider.php index fc9335a..6a0f50a 100644 --- a/parts/quests/single/slider.php +++ b/parts/quests/single/slider.php @@ -4,19 +4,11 @@ '; - } - } + $image_array = get_field('quest_slider_imgs'); + foreach ( $image_array as $image ) { ?> + + ?> diff --git a/php/wordpress/actions.php b/php/wordpress/actions.php index 7feb239..e5d54c3 100644 --- a/php/wordpress/actions.php +++ b/php/wordpress/actions.php @@ -1,21 +1,19 @@ \ No newline at end of file diff --git a/php/wordpress/constants.php b/php/wordpress/constants.php new file mode 100644 index 0000000..0491da2 --- /dev/null +++ b/php/wordpress/constants.php @@ -0,0 +1,18 @@ + get_template_directory_uri() . '/assets', + 'css' => get_template_directory_uri() . '/assets/css', + 'js' => get_template_directory_uri() . '/assets/js', + 'libs' => get_template_directory_uri() . '/assets/libs', + 'img' => get_template_directory_uri() . '/assets/img', + ]; + + $version = '1.0.1'; + } +?> \ No newline at end of file diff --git a/php/wordpress/filters.php b/php/wordpress/filters.php index 41006df..5ca77f2 100644 --- a/php/wordpress/filters.php +++ b/php/wordpress/filters.php @@ -1,3 +1,13 @@ theme_location == 'header_menu' ) { + $classes[] = 'header-submenu'; + } + if ( $args->theme_location == 'footer_menu' ) { + $classes[] = 'footer__submenu'; + } + + return $classes; + } ?> \ No newline at end of file diff --git a/php/wordpress/mail.php b/php/wordpress/mail.php index 11037a7..6e93ab5 100644 --- a/php/wordpress/mail.php +++ b/php/wordpress/mail.php @@ -1,4 +1,6 @@ 'Меню в шапке', 'footer_menu' => 'Меню в подвале' ] ); } - - function change_wp_nav_menu( $classes, $args, $depth ) { - if ( $args->theme_location == 'header_menu' ) { - $classes[] = 'header-submenu'; - } - if ( $args->theme_location == 'footer_menu' ) { - $classes[] = 'footer__submenu'; - } - - return $classes; - } ?> \ No newline at end of file diff --git a/php/wordpress/scripts.php b/php/wordpress/scripts.php index 4464b95..575484b 100644 --- a/php/wordpress/scripts.php +++ b/php/wordpress/scripts.php @@ -1,47 +1,52 @@ \ No newline at end of file diff --git a/php/wordpress/styles.php b/php/wordpress/styles.php index 020fa84..7a462aa 100644 --- a/php/wordpress/styles.php +++ b/php/wordpress/styles.php @@ -1,37 +1,44 @@ \ No newline at end of file diff --git a/php/wordpress/types.php b/php/wordpress/types.php index a0798a4..a465767 100644 --- a/php/wordpress/types.php +++ b/php/wordpress/types.php @@ -1,4 +1,5 @@ - array(