From f9c0c8483e77c31bebf79506ef2864db897a399c Mon Sep 17 00:00:00 2001
From: Sergey Krylov <ksv741@mail.ru>
Date: Sun, 21 Mar 2021 16:15:02 +0300
Subject: [PATCH] fix styles font and constants

---
 gulpfile.js                     | 16 ++++++++++------
 php/wordpress/styles.php        |  3 ++-
 src/sass/constansts.sass        |  4 ++++
 src/sass/fonts.sass             | 24 +++++++++++-------------
 src/sass/other.sass             |  2 +-
 src/sass/pages/about.sass       |  2 +-
 src/sass/pages/contacts.sass    |  2 +-
 src/sass/pages/form.sass        |  2 +-
 src/sass/pages/graduation.sass  |  6 +-----
 src/sass/pages/holiday.sass     |  1 -
 src/sass/pages/price.sass       |  2 +-
 src/sass/pages/quests.sass      |  1 -
 src/sass/parts/compound.sass    |  2 +-
 src/sass/parts/discounts.sass   |  2 +-
 src/sass/parts/header.sass      |  2 +-
 src/sass/parts/map-block.sass   |  2 +-
 src/sass/parts/order.sass       |  2 +-
 src/sass/parts/packages.sass    |  2 +-
 src/sass/parts/page-header.sass |  0
 src/sass/parts/principals.sass  |  2 +-
 src/sass/style.sass             |  1 -
 21 files changed, 40 insertions(+), 40 deletions(-)
 create mode 100644 src/sass/constansts.sass
 delete mode 100644 src/sass/parts/page-header.sass

diff --git a/gulpfile.js b/gulpfile.js
index 26ffe74..d02ddb1 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -26,13 +26,11 @@ const getCss = async (mode = 'develop') => {
   }
 
   return src('src/sass/**/*.sass')
-    // .pipe(sourcemaps.init())
-    // .pipe(newer('*'))
-    .pipe(sass())
-    .pipe(autoprefixer())
-    // .pipe(sourcemaps.write('./maps'))
+    .pipe(newer('*'))
+    .pipe(sourcemaps.init())
+    .pipe(sass.sync().on('error', sass.logError))
+    .pipe(sourcemaps.write('./maps'))
     .pipe(dest('assets/css'))
-    // .pipe(browser.stream({match: '**/*.css'}));
     .pipe(browser.reload({stream: true}));
 }
 
@@ -44,10 +42,16 @@ function getJs() {
   .pipe(dest('./assets/js'))
 }
 
+function getFonts() {
+  return src('src/fonts/**/*.{ttf,woff,woff2,svg,eot}')
+    .pipe(dest('assets/fonts/'))
+}
+
 function check() {
   watch('src/sass/**/*.sass', getCss.bind(null, 'develop')).on('change', browser.reload.bind(null, {stream: true}));
   watch('src/js/**/*.js', getJs).on('change', browser.reload);
   watch('src/img/*', compressImages).on('change', browser.reload);
+  watch('src/fonts/**/*.{ttf,woff,woff2,svg,eot}', getFonts).on('change', browser.reload);
 
   watch('**/*.php').on('change', browser.reload);
   watch('templates/*.php').on('add', checkNewTemplates);
diff --git a/php/wordpress/styles.php b/php/wordpress/styles.php
index 8d59270..020fa84 100644
--- a/php/wordpress/styles.php
+++ b/php/wordpress/styles.php
@@ -4,6 +4,7 @@ function armanty_get_styles(){
   wp_enqueue_style( 'styles', get_stylesheet_uri());
 
   wp_enqueue_style('fonts', "https://fonts.googleapis.com/css?family=PT+Sans:400,700&display=swap&subset=cyrillic");
+  wp_enqueue_style('my_fonts', get_template_directory_uri() . '/assets/css/fonts.css');
   wp_enqueue_style('fontawesome', get_template_directory_uri() . '/assets/libs/font-awesome-4.7.0/css/font-awesome.min.css');
   wp_enqueue_style('bootstrap', get_template_directory_uri() . '/assets/libs/bootstrap-4.4.1-dist/css/bootstrap.min.css');
   wp_enqueue_style('owlcarousel', get_template_directory_uri() . '/assets/libs/OwlCarousel2-2.3.4/dist/assets/owl.carousel.min.css');
@@ -14,8 +15,8 @@ function armanty_get_styles(){
   wp_enqueue_style('bootstrapselect', get_template_directory_uri() . '/assets/libs/bootstrap-select/bootstrap-select.min.css');
   wp_enqueue_style('slick', 'http://cdn.jsdelivr.net/npm/slick-carousel@1.8.1/slick/slick.css');
 
-  wp_enqueue_style('armanty_style', get_template_directory_uri() . '/assets/css/style.css');
   wp_enqueue_style('armanty_other', get_template_directory_uri() . '/assets/css/other.css');
+  wp_enqueue_style('armanty_style', get_template_directory_uri() . '/assets/css/style.css');
 
   if (is_page_template('templates/about.php')) wp_enqueue_style('armanty_about', get_template_directory_uri() . '/assets/css/pages/about.css');
   if (is_page_template('templates/certificates.php')) wp_enqueue_style('armanty_certificates', get_template_directory_uri() . '/assets/css/pages/certificates.css');
diff --git a/src/sass/constansts.sass b/src/sass/constansts.sass
new file mode 100644
index 0000000..55f2245
--- /dev/null
+++ b/src/sass/constansts.sass
@@ -0,0 +1,4 @@
+$main-color: #dc3545
+$title-color: #732B3C
+$text-color: #5A5A5A
+$btn-color: #00C981
\ No newline at end of file
diff --git a/src/sass/fonts.sass b/src/sass/fonts.sass
index 1f0533b..45a9dee 100644
--- a/src/sass/fonts.sass
+++ b/src/sass/fonts.sass
@@ -1,45 +1,43 @@
-$main-color: #dc3545
-
 @font-face 
   font-family: 'Museo Thin' // Имя шрифта 
-  src: url(../../fonts/Museo-Sans-Cyr/MuseoSansCyrl.otf) //Путь к файлу со шрифтом 
+  src: url(../fonts/Museo-Sans-Cyr/MuseoSansCyrl.otf) //Путь к файлу со шрифтом 
 
 @font-face 
   font-family: 'Museo Light' // Имя шрифта 
-  src: url(../../fonts/Museo-Sans-Cyr/MuseoSansCyrl_0.otf) //Путь к файлу со шрифтом 
+  src: url(../fonts/Museo-Sans-Cyr/MuseoSansCyrl_0.otf) //Путь к файлу со шрифтом 
 
 @font-face 
   font-family: 'Museo Regular' // Имя шрифта 
-  src: url(../../fonts/Museo-Sans-Cyr/MuseoSansCyrl_1.otf) //Путь к файлу со шрифтом 
+  src: url(../fonts/Museo-Sans-Cyr/MuseoSansCyrl_1.otf) //Путь к файлу со шрифтом 
 
 @font-face 
   font-family: 'Museo Bold' // Имя шрифта 
-  src: url(../../fonts/Museo-Sans-Cyr/MuseoSansCyrl_2.otf) //Путь к файлу со шрифтом 
+  src: url(../fonts/Museo-Sans-Cyr/MuseoSansCyrl_2.otf) //Путь к файлу со шрифтом 
 
 @font-face 
   font-family: 'Museo Black' // Имя шрифта 
-  src: url(../../fonts/Museo-Sans-Cyr/MuseoSansCyrl_3.otf) //Путь к файлу со шрифтом 
-  src: url(../../fonts/Museo-Sans-Cyr/MuseoSansCyrl_2.otf) //Путь к файлу со шрифтом 
+  src: url(../fonts/Museo-Sans-Cyr/MuseoSansCyrl_3.otf) //Путь к файлу со шрифтом 
+  src: url(../fonts/Museo-Sans-Cyr/MuseoSansCyrl_2.otf) //Путь к файлу со шрифтом 
 
 @font-face 
   font-family: 'Shadow Regular'
-  src: url('../../fonts/Shadow/Shadow-Regular.ttf') format('truetype')
+  src: url('../fonts/Shadow/Shadow-Regular.ttf') format('truetype')
   font-style: normal
   font-weight: normal
 
 @font-face
   font-family: 'Montserrat'
-  src: url('../../fonts/Montserrat/Montserrat-Regular.ttf') format('truetype')
+  src: url('../fonts/Montserrat/Montserrat-Regular.ttf') format('truetype')
 @font-face
   font-family: 'Montserrat'
-  src: url('../../fonts/Montserrat/Montserrat-Medium.ttf') format('truetype')
+  src: url('../fonts/Montserrat/Montserrat-Medium.ttf') format('truetype')
   font-weight: 500
 
 @font-face
   font-family: 'Roboto'
-  src: url('../../fonts/Roboto/Roboto-Regular.ttf') format('truetype')
+  src: url('../fonts/Roboto/Roboto-Regular.ttf') format('truetype')
   font-weight: 400
 @font-face
   font-family: 'Roboto'
-  src: url('../../fonts/Roboto/Roboto-Medium.ttf') format('truetype')
+  src: url('../fonts/Roboto/Roboto-Medium.ttf') format('truetype')
   font-weight: 500
\ No newline at end of file
diff --git a/src/sass/other.sass b/src/sass/other.sass
index 491249b..659f579 100644
--- a/src/sass/other.sass
+++ b/src/sass/other.sass
@@ -1,4 +1,4 @@
-@import "fonts"
+@import './constansts'
 
 .full-page__border
   margin-top: -20px
diff --git a/src/sass/pages/about.sass b/src/sass/pages/about.sass
index 2d41c52..7c58a07 100644
--- a/src/sass/pages/about.sass
+++ b/src/sass/pages/about.sass
@@ -1,4 +1,4 @@
-@import "../fonts"
+@import "../constansts"
 
 .about
   &-text
diff --git a/src/sass/pages/contacts.sass b/src/sass/pages/contacts.sass
index 75ad3d4..e6841a6 100644
--- a/src/sass/pages/contacts.sass
+++ b/src/sass/pages/contacts.sass
@@ -1,4 +1,4 @@
-@import '../fonts'
+@import '../constansts'
 
 .contacts
   font-family: 'Museo Regular', sans-serif
diff --git a/src/sass/pages/form.sass b/src/sass/pages/form.sass
index a033c04..b24137e 100644
--- a/src/sass/pages/form.sass
+++ b/src/sass/pages/form.sass
@@ -1,4 +1,4 @@
-@import '../fonts'
+@import '../constansts'
 @import "../parts/order"
 
 .btn, body
diff --git a/src/sass/pages/graduation.sass b/src/sass/pages/graduation.sass
index cf4f836..9c27063 100644
--- a/src/sass/pages/graduation.sass
+++ b/src/sass/pages/graduation.sass
@@ -1,8 +1,4 @@
-@import '../fonts'
-
-$title-color: #732B3C
-$text-color: #5A5A5A
-$btn-color: #00C981
+@import '../constansts'
 
 h1, h2
   font-family: 'Shadow Regular'
diff --git a/src/sass/pages/holiday.sass b/src/sass/pages/holiday.sass
index b3736a4..8355010 100644
--- a/src/sass/pages/holiday.sass
+++ b/src/sass/pages/holiday.sass
@@ -1,4 +1,3 @@
-@import '../fonts'
 @import "../parts/adding-service"
 @import "../parts/packages"
 @import "../parts/options"
diff --git a/src/sass/pages/price.sass b/src/sass/pages/price.sass
index b39d53f..0339caf 100644
--- a/src/sass/pages/price.sass
+++ b/src/sass/pages/price.sass
@@ -1,4 +1,4 @@
-@import '../fonts'
+@import '../constansts'
 @import '../parts/main-block'
 
 .prices
diff --git a/src/sass/pages/quests.sass b/src/sass/pages/quests.sass
index 39aa629..28f86b5 100644
--- a/src/sass/pages/quests.sass
+++ b/src/sass/pages/quests.sass
@@ -1,4 +1,3 @@
-@import '../fonts'
 @import "../parts/compound"
 
 .quests
diff --git a/src/sass/parts/compound.sass b/src/sass/parts/compound.sass
index a33fa5b..6e9cb16 100644
--- a/src/sass/parts/compound.sass
+++ b/src/sass/parts/compound.sass
@@ -1,4 +1,4 @@
-@import "../fonts"
+@import "../constansts"
 
 .compound
   font-family: 'PT Sans', sans-serif
diff --git a/src/sass/parts/discounts.sass b/src/sass/parts/discounts.sass
index b9486cc..c775fb0 100644
--- a/src/sass/parts/discounts.sass
+++ b/src/sass/parts/discounts.sass
@@ -1,4 +1,4 @@
-@import "../fonts"
+@import "../constansts"
 
 .discount
   padding-top: 40px
diff --git a/src/sass/parts/header.sass b/src/sass/parts/header.sass
index 10c3c25..c0e0f32 100644
--- a/src/sass/parts/header.sass
+++ b/src/sass/parts/header.sass
@@ -1,4 +1,4 @@
-@import "../fonts"
+@import '../constansts'
 
 .header-number
   color: #fff
diff --git a/src/sass/parts/map-block.sass b/src/sass/parts/map-block.sass
index 1d5408c..d7945be 100644
--- a/src/sass/parts/map-block.sass
+++ b/src/sass/parts/map-block.sass
@@ -1,4 +1,4 @@
-@import "../fonts"
+@import '../constansts'
 
 .map-block
   font-family: 'PT Sans', sans-serif
diff --git a/src/sass/parts/order.sass b/src/sass/parts/order.sass
index fbbaa33..4ca0083 100644
--- a/src/sass/parts/order.sass
+++ b/src/sass/parts/order.sass
@@ -1,4 +1,4 @@
-@import "../fonts"
+@import "../constansts"
 
 .order
   align-items: center
diff --git a/src/sass/parts/packages.sass b/src/sass/parts/packages.sass
index 80c91ba..1affa07 100644
--- a/src/sass/parts/packages.sass
+++ b/src/sass/parts/packages.sass
@@ -1,4 +1,4 @@
-@import '../fonts'
+@import '../constansts'
 
 .packages
   padding-top: 15px
diff --git a/src/sass/parts/page-header.sass b/src/sass/parts/page-header.sass
deleted file mode 100644
index e69de29..0000000
diff --git a/src/sass/parts/principals.sass b/src/sass/parts/principals.sass
index 9efe3ca..478bf0e 100644
--- a/src/sass/parts/principals.sass
+++ b/src/sass/parts/principals.sass
@@ -1,4 +1,4 @@
-@import "../fonts"
+@import "../constansts"
 
 .principals
   background: #f2f2f2
diff --git a/src/sass/style.sass b/src/sass/style.sass
index c390284..3728eb5 100644
--- a/src/sass/style.sass
+++ b/src/sass/style.sass
@@ -1,4 +1,3 @@
-@import "fonts"
 @import 'parts/header'
 @import 'parts/footer'