From d3dc2e8ae07812f4b9dd6ad75bd48acfebb099f2 Mon Sep 17 00:00:00 2001 From: Sergey Krylov Date: Sun, 4 Apr 2021 22:38:00 +0300 Subject: [PATCH] one header styles --- gulp/tasks/styles.js | 39 +- header.php | 4 +- package-lock.json | 1228 ++++++++++++++++++++++++++++++++ package.json | 4 + parts/home/main.php | 27 +- php/wordpress/styles.php | 1 + src/js/script.js | 2 +- src/sass/pages/form.scss | 3 - src/sass/parts/header.scss | 89 ++- src/sass/parts/main-block.scss | 156 +--- src/sass/parts/order.scss | 23 - src/sass/parts/packages.scss | 25 +- src/sass/style.scss | 55 +- 13 files changed, 1391 insertions(+), 265 deletions(-) diff --git a/gulp/tasks/styles.js b/gulp/tasks/styles.js index facc1b0..881d6e8 100644 --- a/gulp/tasks/styles.js +++ b/gulp/tasks/styles.js @@ -2,6 +2,7 @@ import gulp from 'gulp'; import gulpif from 'gulp-if'; import sass from 'gulp-sass'; +// import sass from 'gulp-ruby-sass'; import cleanCSS from 'gulp-clean-css'; import newer from 'gulp-newer'; import autoprefixer from 'gulp-autoprefixer'; @@ -9,22 +10,42 @@ import sourcemaps from 'gulp-sourcemaps'; import browser from 'browser-sync'; import pathConfig from '../paths.js' import gcmq from 'gulp-group-css-media-queries'; +import concat from 'gulp-concat'; +import minifyCss from 'gulp-minify-css'; + +// export const stylesBuild = () => { +// return gulp.src(`${pathConfig.src.sass}/**/*.scss`, { +// ignore: pathConfig.isProd && [`${pathConfig.src.sass}/parts/*.scss`] +// }) + +// .pipe(newer('*')) +// .pipe(gulpif(pathConfig.isDevelop, sourcemaps.init())) +// .pipe(sass.sync().on('error', sass.logError)) +// .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)) + +// .pipe(browser.reload({stream: true})); +// } export const stylesBuild = () => { - return gulp.src(`${pathConfig.src.sass}/**/*.scss`, { - ignore: pathConfig.isProd && [`${pathConfig.src.sass}/parts/*.scss`] - }) - - .pipe(newer('*')) + return gulp.src(`${pathConfig.src.sass}/**/*.scss`) .pipe(gulpif(pathConfig.isDevelop, sourcemaps.init())) .pipe(sass.sync().on('error', sass.logError)) - .pipe(gulpif(pathConfig.isProd, gcmq())) - .pipe(gulpif(pathConfig.isProd, autoprefixer())) - .pipe(gulpif(pathConfig.isProd, cleanCSS({ level: 2 }))) + .pipe(concat("bundle.css")) .pipe(gulpif(pathConfig.isDevelop, sourcemaps.write('./'))) .pipe(gulp.dest(pathConfig.assets.css)) - .pipe(browser.reload({stream: true})); + // return sass(`${pathConfig.src.sass}/**/*.scss`) + // .pipe(sourcemaps.write()) + // .pipe(sourcemaps.init({loadMaps: true})) + // .pipe(minifyCss({})) + // .pipe(sourcemaps.init({loadMaps: true})) + // .pipe(concat("app.min.css")) + // .pipe(sourcemaps.write()) + // .pipe(gulp.dest( './build' )); } diff --git a/header.php b/header.php index 515969d..f43c307 100644 --- a/header.php +++ b/header.php @@ -30,11 +30,11 @@
- +
- +
diff --git a/package-lock.json b/package-lock.json index a13d583..09da9ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,12 +21,16 @@ "gulp-browserify": "^0.5.1", "gulp-changed": "^4.0.2", "gulp-clean-css": "^4.3.0", + "gulp-concat": "^2.6.1", + "gulp-concat-css": "^3.1.0", "gulp-group-css-media-queries": "^1.2.2", "gulp-header": "^2.0.9", "gulp-if": "^3.0.0", "gulp-imagemin": "^7.1.0", + "gulp-minify-css": "^1.2.4", "gulp-newer": "^1.4.0", "gulp-rename": "^1.4.0", + "gulp-ruby-sass": "^4.0.0", "gulp-sass": "^4.1.0", "gulp-sourcemaps": "^3.0.0", "gulp-uglify": "^3.0.2", @@ -3773,6 +3777,42 @@ "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", "dev": true }, + "node_modules/bufferstreams": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.0.1.tgz", + "integrity": "sha1-z7GtlWjTujz+k1upq92VLeiKqyo=", + "dev": true, + "dependencies": { + "readable-stream": "^1.0.33" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/bufferstreams/node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "node_modules/bufferstreams/node_modules/readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "node_modules/bufferstreams/node_modules/string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, "node_modules/builtin-status-codes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", @@ -5574,6 +5614,15 @@ "type": "^1.0.1" } }, + "node_modules/dargs": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dargs/-/dargs-3.0.1.tgz", + "integrity": "sha1-Wh8/QzI0Hz8c0Qgp4N8jmW39Kb4=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/dash-ast": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz", @@ -8199,6 +8248,12 @@ "semver": "bin/semver" } }, + "node_modules/find-index": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", + "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=", + "dev": true + }, "node_modules/find-up": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", @@ -8921,6 +8976,19 @@ "node": "6.* || 8.* || >= 10.*" } }, + "node_modules/get-imports": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-imports/-/get-imports-1.0.0.tgz", + "integrity": "sha1-R8C07piTUWQsVJdxk79Pyqv1N48=", + "dev": true, + "dependencies": { + "array-uniq": "^1.0.1", + "import-regex": "^1.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/get-intrinsic": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", @@ -10440,6 +10508,18 @@ "node": ">=0.10.0" } }, + "node_modules/glob2base": { + "version": "0.0.12", + "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", + "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", + "dev": true, + "dependencies": { + "find-index": "^0.1.1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/global-modules": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", @@ -10579,6 +10659,12 @@ "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", "dev": true }, + "node_modules/graceful-readlink": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", + "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", @@ -11880,6 +11966,158 @@ "object.assign": "^4.1.0" } }, + "node_modules/gulp-concat": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz", + "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=", + "dev": true, + "dependencies": { + "concat-with-sourcemaps": "^1.0.0", + "through2": "^2.0.0", + "vinyl": "^2.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/gulp-concat-css": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/gulp-concat-css/-/gulp-concat-css-3.1.0.tgz", + "integrity": "sha512-iLTBPS+cutlgLyK3bp9DMts+WuS8n2mQpjzQ7p/ZVQc8FO5fvpN+ntg9U6jsuNvPeuii82aKm8XeOzF0nUK+TA==", + "dev": true, + "dependencies": { + "lodash.defaults": "^3.0.0", + "parse-import": "^2.0.0", + "plugin-error": "^0.1.2", + "rework": "~1.0.0", + "rework-import": "^2.0.0", + "rework-plugin-url": "^1.0.1", + "through2": "~1.1.1", + "vinyl": "^2.1.0" + } + }, + "node_modules/gulp-concat-css/node_modules/arr-diff": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", + "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", + "dev": true, + "dependencies": { + "arr-flatten": "^1.0.1", + "array-slice": "^0.2.3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-concat-css/node_modules/arr-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", + "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-concat-css/node_modules/array-slice": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", + "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-concat-css/node_modules/extend-shallow": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz", + "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=", + "dev": true, + "dependencies": { + "kind-of": "^1.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-concat-css/node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "node_modules/gulp-concat-css/node_modules/kind-of": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", + "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-concat-css/node_modules/lodash.defaults": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz", + "integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=", + "dev": true, + "dependencies": { + "lodash.assign": "^3.0.0", + "lodash.restparam": "^3.0.0" + } + }, + "node_modules/gulp-concat-css/node_modules/plugin-error": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", + "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=", + "dev": true, + "dependencies": { + "ansi-cyan": "^0.1.1", + "ansi-red": "^0.1.1", + "arr-diff": "^1.0.1", + "arr-union": "^2.0.1", + "extend-shallow": "^1.1.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-concat-css/node_modules/readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "node_modules/gulp-concat-css/node_modules/string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "node_modules/gulp-concat-css/node_modules/through2": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz", + "integrity": "sha1-CEfLxESfNAVXTb3M2buEG4OsNUU=", + "dev": true, + "dependencies": { + "readable-stream": ">=1.1.13-1 <1.2.0-0", + "xtend": ">=4.0.0 <4.1.0-0" + } + }, + "node_modules/gulp-concat/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-decompress": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz", @@ -12837,6 +13075,61 @@ "minimatch": "^3.0.3" } }, + "node_modules/gulp-minify-css": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/gulp-minify-css/-/gulp-minify-css-1.2.4.tgz", + "integrity": "sha1-thZJV2Auon+eWtiCJ2ld0gV3jAY=", + "deprecated": "Please use gulp-clean-css", + "dev": true, + "dependencies": { + "clean-css": "^3.3.3", + "gulp-util": "^3.0.5", + "object-assign": "^4.0.1", + "readable-stream": "^2.0.0", + "vinyl-bufferstream": "^1.0.1", + "vinyl-sourcemaps-apply": "^0.2.0" + } + }, + "node_modules/gulp-minify-css/node_modules/clean-css": { + "version": "3.4.28", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz", + "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=", + "dev": true, + "dependencies": { + "commander": "2.8.x", + "source-map": "0.4.x" + }, + "bin": { + "cleancss": "bin/cleancss" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-minify-css/node_modules/commander": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", + "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", + "dev": true, + "dependencies": { + "graceful-readlink": ">= 1.0.0" + }, + "engines": { + "node": ">= 0.6.x" + } + }, + "node_modules/gulp-minify-css/node_modules/source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "dependencies": { + "amdefine": ">=0.0.4" + }, + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/gulp-newer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/gulp-newer/-/gulp-newer-1.4.0.tgz", @@ -12925,6 +13218,184 @@ "node": ">=4" } }, + "node_modules/gulp-ruby-sass": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/gulp-ruby-sass/-/gulp-ruby-sass-4.0.0.tgz", + "integrity": "sha512-J126A/96Jy4LKK2xYsLgWWlouhFEeQKodMpeAFevd3CZuMD0Zwri26GMmgcaN3RSlW8rl9OTF6Kdlgekc642Ow==", + "deprecated": "Ruby Sass itself is deprecated. Switch to `gulp-sass` which uses Dart Sass or Node Sass.", + "dev": true, + "dependencies": { + "chalk": "^2.3.0", + "convert-source-map": "^1.0.0", + "cross-spawn": "^5.0.0", + "dargs": "^3.0.1", + "each-async": "^1.0.0", + "escape-string-regexp": "^1.0.3", + "fancy-log": "^1.3.2", + "glob": "^7.0.3", + "glob2base": "0.0.12", + "md5-hex": "^2.0.0", + "path-exists": "^3.0.0", + "plugin-error": "^0.1.2", + "replace-ext": "^1.0.0", + "rimraf": "^2.2.8", + "vinyl": "^2.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/gulp-ruby-sass/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/gulp-ruby-sass/node_modules/arr-diff": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", + "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", + "dev": true, + "dependencies": { + "arr-flatten": "^1.0.1", + "array-slice": "^0.2.3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-ruby-sass/node_modules/arr-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", + "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-ruby-sass/node_modules/array-slice": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", + "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-ruby-sass/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/gulp-ruby-sass/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/gulp-ruby-sass/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "node_modules/gulp-ruby-sass/node_modules/extend-shallow": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz", + "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=", + "dev": true, + "dependencies": { + "kind-of": "^1.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-ruby-sass/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/gulp-ruby-sass/node_modules/kind-of": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", + "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-ruby-sass/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/gulp-ruby-sass/node_modules/plugin-error": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", + "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=", + "dev": true, + "dependencies": { + "ansi-cyan": "^0.1.1", + "ansi-red": "^0.1.1", + "arr-diff": "^1.0.1", + "arr-union": "^2.0.1", + "extend-shallow": "^1.1.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-ruby-sass/node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/gulp-ruby-sass/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/gulp-sass": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-4.1.0.tgz", @@ -14541,6 +15012,15 @@ "node": ">=8" } }, + "node_modules/import-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/import-regex/-/import-regex-1.1.0.tgz", + "integrity": "sha1-pVxS5McFx2XKIQ6SQqBrvMiqf2Y=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -16011,6 +16491,16 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, + "node_modules/lodash._baseassign": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", + "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", + "dev": true, + "dependencies": { + "lodash._basecopy": "^3.0.0", + "lodash.keys": "^3.0.0" + } + }, "node_modules/lodash._basecopy": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", @@ -16029,6 +16519,23 @@ "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", "dev": true }, + "node_modules/lodash._bindcallback": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz", + "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=", + "dev": true + }, + "node_modules/lodash._createassigner": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz", + "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=", + "dev": true, + "dependencies": { + "lodash._bindcallback": "^3.0.0", + "lodash._isiterateecall": "^3.0.0", + "lodash.restparam": "^3.0.0" + } + }, "node_modules/lodash._escapehtmlchar": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz", @@ -16128,6 +16635,17 @@ "lodash._objecttypes": "~2.4.1" } }, + "node_modules/lodash.assign": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz", + "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=", + "dev": true, + "dependencies": { + "lodash._baseassign": "^3.0.0", + "lodash._createassigner": "^3.0.0", + "lodash.keys": "^3.0.0" + } + }, "node_modules/lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", @@ -16876,6 +17394,24 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/md5-hex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz", + "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=", + "dev": true, + "dependencies": { + "md5-o-matic": "^0.1.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/md5-o-matic": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", + "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", + "dev": true + }, "node_modules/md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -19895,6 +20431,18 @@ "node": ">=0.10.0" } }, + "node_modules/parse-import": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-import/-/parse-import-2.0.0.tgz", + "integrity": "sha1-KyR0Aw4AirmNt2xLy/TbWucwb18=", + "dev": true, + "dependencies": { + "get-imports": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/parse-json": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", @@ -22118,6 +22666,113 @@ "node": ">=0.10.0" } }, + "node_modules/rework": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz", + "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=", + "dev": true, + "dependencies": { + "convert-source-map": "^0.3.3", + "css": "^2.0.0" + } + }, + "node_modules/rework-import": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/rework-import/-/rework-import-2.1.0.tgz", + "integrity": "sha1-wm7StTFZrHvi7GDaIj74lgPB7x8=", + "dev": true, + "dependencies": { + "css": "^2.0.0", + "globby": "^2.0.0", + "parse-import": "^2.0.0", + "url-regex": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/rework-import/node_modules/array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dev": true, + "dependencies": { + "array-uniq": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/rework-import/node_modules/glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "dependencies": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/rework-import/node_modules/globby": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-2.1.0.tgz", + "integrity": "sha1-npGSvNM/Srak+JTl5+qLcTITxII=", + "dev": true, + "dependencies": { + "array-union": "^1.0.1", + "async": "^1.2.1", + "glob": "^5.0.3", + "object-assign": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/rework-import/node_modules/object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/rework-plugin-function": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/rework-plugin-function/-/rework-plugin-function-1.0.2.tgz", + "integrity": "sha1-Es5G+1sptdk1FGaD9rmM9J0jc7k=", + "dev": true, + "dependencies": { + "rework-visit": "^1.0.0" + } + }, + "node_modules/rework-plugin-url": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/rework-plugin-url/-/rework-plugin-url-1.1.0.tgz", + "integrity": "sha1-q1PosQV7nV7MHIJz/32xhgg3XEU=", + "dev": true, + "dependencies": { + "rework-plugin-function": "^1.0.0" + } + }, + "node_modules/rework-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz", + "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=", + "dev": true + }, + "node_modules/rework/node_modules/convert-source-map": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz", + "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=", + "dev": true + }, "node_modules/rfile": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz", @@ -25932,6 +26587,15 @@ "xtend": "~4.0.1" } }, + "node_modules/vinyl-bufferstream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/vinyl-bufferstream/-/vinyl-bufferstream-1.0.1.tgz", + "integrity": "sha1-BTeGn1gO/6TKRay0dXnkuf5jCBo=", + "dev": true, + "dependencies": { + "bufferstreams": "1.0.1" + } + }, "node_modules/vinyl-fs": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz", @@ -30213,6 +30877,41 @@ "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", "dev": true }, + "bufferstreams": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.0.1.tgz", + "integrity": "sha1-z7GtlWjTujz+k1upq92VLeiKqyo=", + "dev": true, + "requires": { + "readable-stream": "^1.0.33" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, "builtin-status-codes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", @@ -31703,6 +32402,12 @@ "type": "^1.0.1" } }, + "dargs": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dargs/-/dargs-3.0.1.tgz", + "integrity": "sha1-Wh8/QzI0Hz8c0Qgp4N8jmW39Kb4=", + "dev": true + }, "dash-ast": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz", @@ -33924,6 +34629,12 @@ } } }, + "find-index": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", + "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=", + "dev": true + }, "find-up": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", @@ -34508,6 +35219,16 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, + "get-imports": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-imports/-/get-imports-1.0.0.tgz", + "integrity": "sha1-R8C07piTUWQsVJdxk79Pyqv1N48=", + "dev": true, + "requires": { + "array-uniq": "^1.0.1", + "import-regex": "^1.1.0" + } + }, "get-intrinsic": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", @@ -35733,6 +36454,15 @@ } } }, + "glob2base": { + "version": "0.0.12", + "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", + "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", + "dev": true, + "requires": { + "find-index": "^0.1.1" + } + }, "global-modules": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", @@ -35842,6 +36572,12 @@ "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", "dev": true }, + "graceful-readlink": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", + "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", @@ -36963,6 +37699,141 @@ } } }, + "gulp-concat": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz", + "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=", + "dev": true, + "requires": { + "concat-with-sourcemaps": "^1.0.0", + "through2": "^2.0.0", + "vinyl": "^2.0.0" + }, + "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-concat-css": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/gulp-concat-css/-/gulp-concat-css-3.1.0.tgz", + "integrity": "sha512-iLTBPS+cutlgLyK3bp9DMts+WuS8n2mQpjzQ7p/ZVQc8FO5fvpN+ntg9U6jsuNvPeuii82aKm8XeOzF0nUK+TA==", + "dev": true, + "requires": { + "lodash.defaults": "^3.0.0", + "parse-import": "^2.0.0", + "plugin-error": "^0.1.2", + "rework": "~1.0.0", + "rework-import": "^2.0.0", + "rework-plugin-url": "^1.0.1", + "through2": "~1.1.1", + "vinyl": "^2.1.0" + }, + "dependencies": { + "arr-diff": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", + "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", + "dev": true, + "requires": { + "arr-flatten": "^1.0.1", + "array-slice": "^0.2.3" + } + }, + "arr-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", + "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=", + "dev": true + }, + "array-slice": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", + "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", + "dev": true + }, + "extend-shallow": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz", + "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=", + "dev": true, + "requires": { + "kind-of": "^1.1.0" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "kind-of": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", + "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", + "dev": true + }, + "lodash.defaults": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz", + "integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=", + "dev": true, + "requires": { + "lodash.assign": "^3.0.0", + "lodash.restparam": "^3.0.0" + } + }, + "plugin-error": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", + "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=", + "dev": true, + "requires": { + "ansi-cyan": "^0.1.1", + "ansi-red": "^0.1.1", + "arr-diff": "^1.0.1", + "arr-union": "^2.0.1", + "extend-shallow": "^1.1.2" + } + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "through2": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz", + "integrity": "sha1-CEfLxESfNAVXTb3M2buEG4OsNUU=", + "dev": true, + "requires": { + "readable-stream": ">=1.1.13-1 <1.2.0-0", + "xtend": ">=4.0.0 <4.1.0-0" + } + } + } + }, "gulp-decompress": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz", @@ -37753,6 +38624,50 @@ "minimatch": "^3.0.3" } }, + "gulp-minify-css": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/gulp-minify-css/-/gulp-minify-css-1.2.4.tgz", + "integrity": "sha1-thZJV2Auon+eWtiCJ2ld0gV3jAY=", + "dev": true, + "requires": { + "clean-css": "^3.3.3", + "gulp-util": "^3.0.5", + "object-assign": "^4.0.1", + "readable-stream": "^2.0.0", + "vinyl-bufferstream": "^1.0.1", + "vinyl-sourcemaps-apply": "^0.2.0" + }, + "dependencies": { + "clean-css": { + "version": "3.4.28", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz", + "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=", + "dev": true, + "requires": { + "commander": "2.8.x", + "source-map": "0.4.x" + } + }, + "commander": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", + "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", + "dev": true, + "requires": { + "graceful-readlink": ">= 1.0.0" + } + }, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": ">=0.0.4" + } + } + } + }, "gulp-newer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/gulp-newer/-/gulp-newer-1.4.0.tgz", @@ -37822,6 +38737,146 @@ "integrity": "sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg==", "dev": true }, + "gulp-ruby-sass": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/gulp-ruby-sass/-/gulp-ruby-sass-4.0.0.tgz", + "integrity": "sha512-J126A/96Jy4LKK2xYsLgWWlouhFEeQKodMpeAFevd3CZuMD0Zwri26GMmgcaN3RSlW8rl9OTF6Kdlgekc642Ow==", + "dev": true, + "requires": { + "chalk": "^2.3.0", + "convert-source-map": "^1.0.0", + "cross-spawn": "^5.0.0", + "dargs": "^3.0.1", + "each-async": "^1.0.0", + "escape-string-regexp": "^1.0.3", + "fancy-log": "^1.3.2", + "glob": "^7.0.3", + "glob2base": "0.0.12", + "md5-hex": "^2.0.0", + "path-exists": "^3.0.0", + "plugin-error": "^0.1.2", + "replace-ext": "^1.0.0", + "rimraf": "^2.2.8", + "vinyl": "^2.1.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "arr-diff": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", + "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", + "dev": true, + "requires": { + "arr-flatten": "^1.0.1", + "array-slice": "^0.2.3" + } + }, + "arr-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", + "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=", + "dev": true + }, + "array-slice": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", + "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", + "dev": true + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "extend-shallow": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz", + "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=", + "dev": true, + "requires": { + "kind-of": "^1.1.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "kind-of": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", + "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "plugin-error": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", + "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=", + "dev": true, + "requires": { + "ansi-cyan": "^0.1.1", + "ansi-red": "^0.1.1", + "arr-diff": "^1.0.1", + "arr-union": "^2.0.1", + "extend-shallow": "^1.1.2" + } + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "gulp-sass": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-4.1.0.tgz", @@ -39101,6 +40156,12 @@ "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", "dev": true }, + "import-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/import-regex/-/import-regex-1.1.0.tgz", + "integrity": "sha1-pVxS5McFx2XKIQ6SQqBrvMiqf2Y=", + "dev": true + }, "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -40198,6 +41259,16 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, + "lodash._baseassign": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", + "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", + "dev": true, + "requires": { + "lodash._basecopy": "^3.0.0", + "lodash.keys": "^3.0.0" + } + }, "lodash._basecopy": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", @@ -40216,6 +41287,23 @@ "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", "dev": true }, + "lodash._bindcallback": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz", + "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=", + "dev": true + }, + "lodash._createassigner": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz", + "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=", + "dev": true, + "requires": { + "lodash._bindcallback": "^3.0.0", + "lodash._isiterateecall": "^3.0.0", + "lodash.restparam": "^3.0.0" + } + }, "lodash._escapehtmlchar": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz", @@ -40317,6 +41405,17 @@ "lodash._objecttypes": "~2.4.1" } }, + "lodash.assign": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz", + "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=", + "dev": true, + "requires": { + "lodash._baseassign": "^3.0.0", + "lodash._createassigner": "^3.0.0", + "lodash.keys": "^3.0.0" + } + }, "lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", @@ -40950,6 +42049,21 @@ "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==", "dev": true }, + "md5-hex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz", + "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=", + "dev": true, + "requires": { + "md5-o-matic": "^0.1.1" + } + }, + "md5-o-matic": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", + "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", + "dev": true + }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -43371,6 +44485,15 @@ } } }, + "parse-import": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-import/-/parse-import-2.0.0.tgz", + "integrity": "sha1-KyR0Aw4AirmNt2xLy/TbWucwb18=", + "dev": true, + "requires": { + "get-imports": "^1.0.0" + } + }, "parse-json": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", @@ -45131,6 +46254,102 @@ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true }, + "rework": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz", + "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=", + "dev": true, + "requires": { + "convert-source-map": "^0.3.3", + "css": "^2.0.0" + }, + "dependencies": { + "convert-source-map": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz", + "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=", + "dev": true + } + } + }, + "rework-import": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/rework-import/-/rework-import-2.1.0.tgz", + "integrity": "sha1-wm7StTFZrHvi7GDaIj74lgPB7x8=", + "dev": true, + "requires": { + "css": "^2.0.0", + "globby": "^2.0.0", + "parse-import": "^2.0.0", + "url-regex": "^3.0.0" + }, + "dependencies": { + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dev": true, + "requires": { + "array-uniq": "^1.0.1" + } + }, + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "globby": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-2.1.0.tgz", + "integrity": "sha1-npGSvNM/Srak+JTl5+qLcTITxII=", + "dev": true, + "requires": { + "array-union": "^1.0.1", + "async": "^1.2.1", + "glob": "^5.0.3", + "object-assign": "^3.0.0" + } + }, + "object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", + "dev": true + } + } + }, + "rework-plugin-function": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/rework-plugin-function/-/rework-plugin-function-1.0.2.tgz", + "integrity": "sha1-Es5G+1sptdk1FGaD9rmM9J0jc7k=", + "dev": true, + "requires": { + "rework-visit": "^1.0.0" + } + }, + "rework-plugin-url": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/rework-plugin-url/-/rework-plugin-url-1.1.0.tgz", + "integrity": "sha1-q1PosQV7nV7MHIJz/32xhgg3XEU=", + "dev": true, + "requires": { + "rework-plugin-function": "^1.0.0" + } + }, + "rework-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz", + "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=", + "dev": true + }, "rfile": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz", @@ -48226,6 +49445,15 @@ } } }, + "vinyl-bufferstream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/vinyl-bufferstream/-/vinyl-bufferstream-1.0.1.tgz", + "integrity": "sha1-BTeGn1gO/6TKRay0dXnkuf5jCBo=", + "dev": true, + "requires": { + "bufferstreams": "1.0.1" + } + }, "vinyl-fs": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz", diff --git a/package.json b/package.json index 6a951dd..c385409 100644 --- a/package.json +++ b/package.json @@ -17,12 +17,16 @@ "gulp-browserify": "^0.5.1", "gulp-changed": "^4.0.2", "gulp-clean-css": "^4.3.0", + "gulp-concat": "^2.6.1", + "gulp-concat-css": "^3.1.0", "gulp-group-css-media-queries": "^1.2.2", "gulp-header": "^2.0.9", "gulp-if": "^3.0.0", "gulp-imagemin": "^7.1.0", + "gulp-minify-css": "^1.2.4", "gulp-newer": "^1.4.0", "gulp-rename": "^1.4.0", + "gulp-ruby-sass": "^4.0.0", "gulp-sass": "^4.1.0", "gulp-sourcemaps": "^3.0.0", "gulp-uglify": "^3.0.2", diff --git a/parts/home/main.php b/parts/home/main.php index 73df5d4..4e7ef3e 100644 --- a/parts/home/main.php +++ b/parts/home/main.php @@ -1,29 +1,4 @@
-
- - \ No newline at end of file +
\ No newline at end of file diff --git a/php/wordpress/styles.php b/php/wordpress/styles.php index db3161c..6af0afa 100644 --- a/php/wordpress/styles.php +++ b/php/wordpress/styles.php @@ -12,6 +12,7 @@ // Common styles wp_enqueue_style('armanty_style', $css . '/style.css', array(), $styleVersion); + wp_enqueue_style('bundle', $css . '/bundle.css', array(), $styleVersion); // Pages styles if (is_page_template('templates/about.php')) wp_enqueue_style('armanty_about', $pagesStyle . '/about.css', array(), $styleVersion); diff --git a/src/js/script.js b/src/js/script.js index 863128e..0a61e48 100644 --- a/src/js/script.js +++ b/src/js/script.js @@ -19,7 +19,7 @@ $(document).ready(function(){ const orderEmail = document.getElementById('orderEmail'); const orderOthers = document.getElementById('orderOthers'); - const callBackBtn = document.querySelector('.order-call'); + const callBackBtn = document.querySelector('.header_order-call'); const callBackForm = document.querySelector('.callback-modal form'); const callBackModal = document.querySelector('.callback-modal'); const callBackLayout = document.querySelector('.callback-modal__layout'); diff --git a/src/sass/pages/form.scss b/src/sass/pages/form.scss index 002f391..e8b7023 100644 --- a/src/sass/pages/form.scss +++ b/src/sass/pages/form.scss @@ -5,9 +5,6 @@ @import '../../libs/bootstrap_datetimepicker/css/bootstrap.min.css'; @import '../../libs/bootstrap-select/bootstrap-select.min.css'; -.btn, body { - font-size: 16px !important; -} .form-block { h1 { diff --git a/src/sass/parts/header.scss b/src/sass/parts/header.scss index a846279..e707503 100644 --- a/src/sass/parts/header.scss +++ b/src/sass/parts/header.scss @@ -70,7 +70,7 @@ margin-right: 10px; } - .order-holiday { + .header_order-holiday { &:hover { background-color: #ffffff; color: $main-color; @@ -254,15 +254,10 @@ button { padding: 3px 10px; - font-size: 18px !important; + font-size: 18px; } } -.popover { - z-index: 999999; - margin-top: 20px !important; -} - .header-navmenu__container { overflow: visible !important; padding: 15px 350px; @@ -282,6 +277,11 @@ transition: 0.3s ease-in-out; } +.popover { + z-index: 999999; + margin-top: 20px !important; +} + .sub-menu { .header-navmenu__item { background: none; @@ -337,11 +337,11 @@ } } - .header-navmenu__item a, .header-info__city span, .header button.order-holiday { + .header-navmenu__item a, .header-info__city span, .header button.header_header_order-holiday { font-size: 12px !important; } - .header button.order-holiday { + .header button.header_order-holiday { line-height: 1.15; } @@ -477,7 +477,7 @@ transform: translateY(-60px); } - button.order-holiday { + button.header_order-holiday { width: 125px; margin-right: 0 !important; transform: translateX(-10px); @@ -566,3 +566,72 @@ padding: 0; } } + +@media screen and (min-width: 576px) and (max-width: 1700px) { + .header-info__logo img { + height: 60px; + } + + .header-container { + padding: 0 50px; + } + + .header-navmenu__container { + padding: 15px 50px; + } + + .header-phone-number-block { + padding: 0; + } +} + +@media screen and (max-width: 576px) { + .header-navmenu__item { + &:first-child { + display: none; + } + } +} + +@media screen and (max-width: 480px) { + .header_order-call { + display: block; + } + + .header_order-holiday { + width: 118px; + height: 30px !important; + margin: 0; + padding: 5px !important; + border-radius: 10px; + font-size: 12px !important; + } +} + +@media screen and (max-width: 1200px) { + .header_order-call { + display: none; + } +} + + +@media screen and (max-width: 1200px) { + .header_order-call { + display: none; + } +} + +@media screen and (max-width: 768px) { + .header_order-holiday { + height: 34px !important; + padding: 0 10px !important; + } +} + +button.btn.holiday-header-btn { + z-index: 2 !important; + margin-top: 10px !important; + padding: 5px 10px !important; + font-size: 15px !important; + text-transform: none; +} diff --git a/src/sass/parts/main-block.scss b/src/sass/parts/main-block.scss index dc0fdd9..9cad5c9 100644 --- a/src/sass/parts/main-block.scss +++ b/src/sass/parts/main-block.scss @@ -1,154 +1,32 @@ @import '../constansts'; -.header-number { - color: #ffffff; - - &:hover { - color: #ffffff; - } +.main { + height: 325px; } -.header { - &-navmenu { - .sub-menu { - li { - margin: 0 0 10px; - padding: 5px 10px; - border-bottom: 1px solid rgba(0, 0, 0, 0.05); - background: #f2f2f2; - color: #606266; - list-style: none; - font-weight: 400; - - &:hover { - background: $main-color; - - a { - color: #f2f2f2 !important; - } - } - } - - a { - width: 100%; - color: #606266; - font-size: 18px; - } - } - } - - button { - padding: 3px 10px; - font-size: 18px !important; - } +.main { + margin-top: 35px; + margin-bottom: 35px; } -.popover { - z-index: 999999; - margin-top: 20px !important; +.main .slider-mobile { + display: none; } -.header-navmenu__item { - display: flex; - justify-content: center; - width: 16.6%; - border-right: 2px solid #ffffff; - background: #f2f2f2; - color: $main-color; - transition: 0.2s; - - &:first-child { - border-top-left-radius: 12px; - border-bottom-left-radius: 12px; +@media screen and (max-width: 425px) { + .main { + height: 180px; + margin-bottom: 10px; } - &:last-child { - width: calc(100% - 16.6%*5); - border-right: 0; - border-top-right-radius: 12px; - border-bottom-right-radius: 12px; - } - - &.current-menu-item { - background: #f2f2f2; - - a { - color: $main-color; - } - } - - a { - width: 100%; - padding: 15px; - color: $main-color; - text-align: center; - } - - a:hover { - text-decoration: none; - } - - &:hover { - border-bottom-right-radius: 0; - background: $main-color; - - a { - color: #f2f2f2; - } - } } -.header-navmenu__list { - margin-bottom: 0; - - &::before { - display: none !important; +@media screen and (max-width: 576px) { + .main .slider-mobile { + display: block; } - &::after { - display: none !important; + .main .slider-desktop{ + display:none; } -} - -.header-navmenu__container { - overflow: visible !important; - padding: 15px 350px; - background: #ffffff; - - .header-navmenu { - box-shadow: 0 2px 12px 0 rgba(153, 153, 153, 0.33); - } -} - -.header-wrapper { - position: sticky; - top: 0; - right: 0; - left: 0; - z-index: 99; - transition: 0.3s ease-in-out; -} - -.sub-menu { - .header-navmenu__item { - background: none; - } -} - -@media screen and (min-width: 576px) and (max-width: 1700px) { - .header-info__logo img { - height: 60px; - } - - .header-container { - padding: 0 50px; - } - - .header-navmenu__container { - padding: 15px 50px; - } - - .header-phone-number-block { - padding: 0; - } -} +} \ No newline at end of file diff --git a/src/sass/parts/order.scss b/src/sass/parts/order.scss index 8794b2d..fbe8e2f 100644 --- a/src/sass/parts/order.scss +++ b/src/sass/parts/order.scss @@ -126,11 +126,6 @@ } } -@media screen and (max-width: 1200px) { - .order-call { - display: none; - } -} @media screen and (max-width: 768px) { .order { @@ -180,11 +175,6 @@ padding: 20px; } } - - .order-holiday { - height: 34px !important; - padding: 0 10px !important; - } } @media screen and (max-width: 480px) { @@ -225,15 +215,6 @@ font-size: 14px; } } - - &-holiday { - width: 118px; - height: 30px !important; - margin: 0; - padding: 5px !important; - border-radius: 10px; - font-size: 12px !important; - } } .order-modal { @@ -245,8 +226,4 @@ } } } - - .order-call { - display: block; - } } diff --git a/src/sass/parts/packages.scss b/src/sass/parts/packages.scss index 8794b2d..cb74998 100644 --- a/src/sass/parts/packages.scss +++ b/src/sass/parts/packages.scss @@ -126,11 +126,7 @@ } } -@media screen and (max-width: 1200px) { - .order-call { - display: none; - } -} + @media screen and (max-width: 768px) { .order { @@ -180,11 +176,6 @@ padding: 20px; } } - - .order-holiday { - height: 34px !important; - padding: 0 10px !important; - } } @media screen and (max-width: 480px) { @@ -225,15 +216,6 @@ font-size: 14px; } } - - &-holiday { - width: 118px; - height: 30px !important; - margin: 0; - padding: 5px !important; - border-radius: 10px; - font-size: 12px !important; - } } .order-modal { @@ -245,8 +227,5 @@ } } } - - .order-call { - display: block; - } + } diff --git a/src/sass/style.scss b/src/sass/style.scss index 27812a3..93ac482 100644 --- a/src/sass/style.scss +++ b/src/sass/style.scss @@ -10,6 +10,30 @@ body { margin: 0; padding: 0; font-family: 'Museo Regular', sans-serif; + font-size: 16px !important; +} + +.btn { + font-size: 16px !important; +} + +#carousel { + max-height: 325px; +} + +#carousel img { + max-height: 325px; +} + +@media screen and (max-width: 425px) { + #carousel { + display: none; + } +} + +.popover { + z-index: 999999; + margin-top: 20px !important; } .full-page__border { @@ -112,10 +136,7 @@ body { padding-top: 8px; } -.main { - margin-top: 35px; - margin-bottom: 35px; -} + .contacts-image { transform: translateY(10px); @@ -224,12 +245,6 @@ body { line-height: 1.2; } } - - .header-navmenu__item { - &:first-child { - display: none; - } - } } @@ -436,25 +451,14 @@ body { } } -.main .slider-mobile { - display:none; -} @media screen and (max-width: 576px) { - .main .slider-mobile { - display: block; - } - - .main .slider-desktop{ - display:none; - } - .packages-item { padding: 25px 23px !important; } .places .places-description { - font-size: 16px!important; + font-size: 16px !important; } } @@ -472,10 +476,3 @@ body { margin-top: 15px; } -button.btn.holiday-header-btn { - padding: 5px 10px !important; - font-size: 15px !important; - z-index: 2 !important; - margin-top: 10px !important; - text-transform: none; -}