work/armanty-quests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Krylov Sergey 2021-04-09 22:38:02 +05:00
parent a1438c170d
commit fe31651001
25 changed files with 94 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gulp/tasks/styles.js
View File

@ -13,40 +13,32 @@ 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`)
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(concat("bundle.css"))
.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))
// 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' ));
.pipe(browser.reload({stream: true}));
}
// export const stylesBuild = () => {
// return gulp.src(`${pathConfig.src.sass}/**/*.scss`)
// .pipe(gulpif(pathConfig.isDevelop, sourcemaps.init()))
// .pipe(sass.sync().on('error', sass.logError))
// .pipe(concat("bundle.css"))
// .pipe(gulpif(pathConfig.isDevelop, sourcemaps.write('./')))
// .pipe(gulp.dest(pathConfig.assets.css))
//
// }
export const stylesDevelop = () => gulp.watch(`${pathConfig.src.sass}/**/*.scss`, stylesBuild).on('change', browser.reload.bind(null, {stream: true}));

28
php/wordpress/styles.php
View File

@ -23,21 +23,21 @@
// Common styles
// wp_enqueue_style('armanty_style', $css . '/style.css', array(), $styleVersion);
wp_enqueue_style('bundle', $css . '/bundle.css', array(), $styleVersion);
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);
// if (is_page_template('templates/certificates.php')) wp_enqueue_style('armanty_certificates', $pagesStyle . '/certificates.css', array(), $styleVersion);
// if (is_page_template('templates/contacts.php')) wp_enqueue_style('armanty_contacts', $pagesStyle . '/contacts.css', array(), $styleVersion);
// if (is_page_template('templates/form.php')) wp_enqueue_style('armanty_form', $pagesStyle . '/form.css', array(), $styleVersion);
// if (is_page_template('templates/gallery.php')) wp_enqueue_style('armanty_gallery', $pagesStyle . '/gallery.css', array(), $styleVersion);
// if (is_page_template('templates/graduation.php')) wp_enqueue_style('armanty_graduation', $pagesStyle . '/graduation.css', array(), $styleVersion);
// if (is_page_template('templates/holiday.php')) wp_enqueue_style('armanty_holiday', $pagesStyle . '/holiday.css', array(), $styleVersion);
// if (is_page_template('templates/home.php')) wp_enqueue_style('armanty_home', $pagesStyle . '/home.css', array(), $styleVersion);
// if (is_page_template('templates/price.php')) wp_enqueue_style('armanty_price', $pagesStyle . '/price.css', array(), $styleVersion);
// if (is_page_template('templates/quests.php')) wp_enqueue_style('armanty_quests', $pagesStyle . '/quests.css', array(), $styleVersion);
// if (is_page_template('templates/sales.php')) wp_enqueue_style('armanty_sales', $pagesStyle . '/sales.css', array(), $styleVersion);
// if (is_page_template('templates/single-quest.php')) wp_enqueue_style('armanty_single-quest', $pagesStyle . '/single-quest.css', array(), $styleVersion);
if (is_page_template('templates/about.php')) wp_enqueue_style('armanty_about', $pagesStyle . '/about.css', array(), $styleVersion);
if (is_page_template('templates/certificates.php')) wp_enqueue_style('armanty_certificates', $pagesStyle . '/certificates.css', array(), $styleVersion);
if (is_page_template('templates/contacts.php')) wp_enqueue_style('armanty_contacts', $pagesStyle . '/contacts.css', array(), $styleVersion);
if (is_page_template('templates/form.php')) wp_enqueue_style('armanty_form', $pagesStyle . '/form.css', array(), $styleVersion);
if (is_page_template('templates/gallery.php')) wp_enqueue_style('armanty_gallery', $pagesStyle . '/gallery.css', array(), $styleVersion);
if (is_page_template('templates/graduation.php')) wp_enqueue_style('armanty_graduation', $pagesStyle . '/graduation.css', array(), $styleVersion);
if (is_page_template('templates/holiday.php')) wp_enqueue_style('armanty_holiday', $pagesStyle . '/holiday.css', array(), $styleVersion);
if (is_page_template('templates/home.php')) wp_enqueue_style('armanty_home', $pagesStyle . '/home.css', array(), $styleVersion);
if (is_page_template('templates/price.php')) wp_enqueue_style('armanty_price', $pagesStyle . '/price.css', array(), $styleVersion);
if (is_page_template('templates/quests.php')) wp_enqueue_style('armanty_quests', $pagesStyle . '/quests.css', array(), $styleVersion);
if (is_page_template('templates/sales.php')) wp_enqueue_style('armanty_sales', $pagesStyle . '/sales.css', array(), $styleVersion);
if (is_page_template('templates/single-quest.php')) wp_enqueue_style('armanty_single-quest', $pagesStyle . '/single-quest.css', array(), $styleVersion);
}
?>

2
src/sass/pages/about.scss
View File

@ -1,4 +1,6 @@
@import '../constansts';
@import '../parts/header';
@import '../parts/footer';
.about {
&-text {

5
src/sass/pages/certificates.scss
View File

@ -1,3 +1,8 @@
@import '../parts/header';
@import '../parts/footer';
@import '../parts/compound';
@import '../parts/page-header';
.cert {
&-text {
margin-top: 50px;

3
src/sass/pages/contacts.scss
View File

@ -1,4 +1,7 @@
@import '../constansts';
@import '../parts/header';
@import '../parts/page-header';
@import '../parts/footer';
.contacts {
padding-bottom: 30px;

9
src/sass/pages/form.scss
View File

@ -1,10 +1,12 @@
@import '../constansts';
@import '../parts/order';
@import '../../libs/bootstrap_datetimepicker/css/bootstrap-datetimepicker.min.css';
@import '../../libs/bootstrap_datetimepicker/css/bootstrap.min.css';
@import '../../libs/bootstrap-select/bootstrap-select.min.css';
@import '../parts/header';
@import '../parts/order-modal';
@import '../parts/footer';
.form-block {
padding-bottom: 10px;
@ -195,10 +197,11 @@
}
.cheque-sum {
padding:5px 10px;
padding: 5px 10px;
}
.cheque-info {
padding:5px 10px;
padding: 5px 10px;
}
@media screen and (max-width: 1200px) {

4
src/sass/pages/gallery.scss
View File

@ -1,3 +1,7 @@
@import '../parts/header';
@import '../parts/page-header';
@import '../parts/footer';
.gallery_box_single {
width: 100%;
}

9
src/sass/pages/holiday.scss
View File

@ -1,8 +1,13 @@
@import '../parts/adding-service';
@import '../parts/header';
@import '../parts/entertainments';
@import '../parts/places';
@import '../parts/adding-service';
@import '../parts/order';
@import '../pages/gallery';
@import '../parts/holiday-photos';
@import '../parts/packages';
@import '../parts/variants';
@import '../parts/compound';
@import '../parts/footer';
.holiday {
&-block {

7
src/sass/pages/home.scss
View File

@ -1,9 +1,10 @@
@import '../parts/header';
@import '../parts/main-block';
@import '../parts/entertainments';
@import '../parts/order';
@import '../parts/places';
@import '../parts/discounts';
@import '../parts/present';
@import '../parts/principals';
@import '../parts/header';
@import '../parts/callback-modal';
@import '../parts/footer';

3
src/sass/pages/price.scss
View File

@ -1,5 +1,6 @@
@import '../constansts';
@import '../parts/main-block';
@import '../parts/header';
@import '../parts/footer';
.prices {
padding-top: 30px;

5
src/sass/pages/quests.scss
View File

@ -1,4 +1,8 @@
@import '../parts/header';
@import '../parts/page-header';
@import '../parts/quests-list';
@import '../parts/compound';
@import '../parts/footer';
.quests {
position: relative;
@ -6,5 +10,4 @@
margin-top: 30px;
background-size: cover;
font-family: 'PT Sans', sans-serif;
}

3
src/sass/pages/sales.scss
View File

@ -1,4 +1,7 @@
@import '../parts/header';
@import '../parts/page-header';
@import '../parts/discounts';
@import '../parts/footer';
.sales-block {
display: flex;

5
src/sass/pages/single-quest.scss
View File

@ -1,3 +1,7 @@
@import '../parts/header';
@import '../parts/quest-single-slider';
@import '../parts/footer';
.quest__booking {
padding-bottom: 10px;
@ -9,7 +13,6 @@
}
.quest-description {
margin-top: 40px;
margin-bottom: 40px;

2
src/sass/parts/callback-modal.scss
View File

@ -50,4 +50,4 @@
font-size: 18px !important;
}
}
}
}

2
src/sass/parts/entertainments.scss
View File

@ -1,3 +1,5 @@
@import './quests-slider';
.quest-description__icons_main {
display: flex;
flex-direction: row;

2
src/sass/parts/header.scss
View File

@ -285,8 +285,8 @@
.header-phone-number-block {
justify-content: center;
border-right: 1px solid #fff;
height: 100%;
border-right: 1px solid #ffffff;
}
.popover {

2
src/sass/parts/holiday-photos.scss
View File

@ -22,4 +22,4 @@
margin-bottom: 30px;
padding-top: 0;
}
}
}

2
src/sass/parts/order.scss
View File

@ -1,4 +1,6 @@
@import '../constansts';
@import "./order-modal";
.order {
position: relative;

8
src/sass/parts/packages.scss
View File

@ -1,17 +1,15 @@
.package-currency {
font-size: 16px !important
font-size: 16px !important;
}
@media screen and (max-width: 576px) {
.packages-item {
padding: 25px 23px !important;
}
}
@media screen and (max-width: 480px) {
.packages-item {
width: 255px;
}
}
}

14
src/sass/parts/page-header.scss
View File

@ -6,8 +6,8 @@
align-items: center;
justify-content: center;
height: 408px;
color: #ffffff;
background-size: cover;
color: #ffffff;
box-shadow: 0 5px 8px 0 rgba(0, 0, 0, 0.5);
text-align: center;
@ -72,6 +72,8 @@
.page {
&__header {
box-shadow: 0 5px 8px 0 rgba(0, 0, 0, 0.5);
font-size: 28px;
line-height: 1.2;
h1 {
font-size: 28px;
@ -84,14 +86,6 @@
}
}
}
.page__header {
h1 {
font-size: 28px;
line-height: 1.2;
}
}
}
@media screen and (max-width: 800px) {
@ -99,4 +93,4 @@
height: 200px;
background-position: top center !important;
}
}
}

5
src/sass/parts/quest-single-slider.scss
View File

@ -1,8 +1,3 @@
.quest__slider {
max-height: 600px;
position: relative;
}
.quest__slider {
position: relative;
max-height: 600px;

2
src/sass/parts/quests-slider.scss
View File

@ -116,4 +116,4 @@
quests-container__quest {
background-size: cover;
}
}

4
src/sass/parts/variants.scss
View File

@ -131,12 +131,10 @@
}
@media screen and (max-width: 576px) {
.var-item {
img {
max-width: 100%;
height: auto;
}
}
}
}

2
src/sass/style.scss
View File

@ -316,4 +316,4 @@ body {
.wave > div {
background: #ffffff;
}
}
}

1
templates/holiday.php
View File

@ -17,7 +17,6 @@
get_template_part('parts/holiday/photos');
get_template_part('parts/holiday/packages');
get_template_part('parts/holiday/var');
get_template_part('parts/home/principals');
?>
</div>