Skip to content

Commit cb81ca4

Browse files
committed
new block wavefix
1 parent 0a82f3b commit cb81ca4

File tree

9 files changed

+6498
-7689
lines changed

9 files changed

+6498
-7689
lines changed

gulp/tasks/styles.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const autoPrefixer = require("gulp-autoprefixer"),
22
plumber = require("gulp-plumber"),
33
concat = require("gulp-concat-css"),
44
prefix = require("gulp-autoprefixer"),
5-
sass = require("gulp-sass"),
5+
sass = require('gulp-sass')(require('sass')),
66
sourcemaps = require("gulp-sourcemaps"),
77
minifyCSS = require("gulp-csso");
88

package-lock.json

+6,382-7,605
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+35-34
Original file line numberDiff line numberDiff line change
@@ -4,50 +4,51 @@
44
"description": "",
55
"main": "index.js",
66
"scripts": {
7-
"test": "mocha",
8-
"gulp": "gulp"
7+
"test": "mocha",
8+
"gulp": "gulp"
99
},
1010
"repository": {
11-
"type": "git",
12-
"url": "git+https://github.com/SamTyurenkov/MUZ21.git"
11+
"type": "git",
12+
"url": "git+https://github.com/SamTyurenkov/pbg.git"
1313
},
1414
"keywords": [],
1515
"author": "",
1616
"license": "ISC",
1717
"bugs": {
18-
"url": "https://github.com/SamTyurenkov/MUZ21/issues"
18+
"url": "https://github.com/SamTyurenkov/pbg/issues"
1919
},
20-
"homepage": "https://github.com/SamTyurenkov/MUZ21#readme",
20+
"homepage": "https://github.com/SamTyurenkov/pbg#readme",
2121
"devDependencies": {
22-
"@babel/core": "^7.14.2",
23-
"@babel/plugin-proposal-class-properties": "^7.13.0",
24-
"@babel/preset-env": "^7.14.2",
25-
"@babel/preset-react": "^7.13.13",
26-
"browser-sync": "^2.27.5",
27-
"del": "^6.0.0",
28-
"gulp": "^4.0.2",
29-
"gulp-autoprefixer": "^7.0.1",
30-
"gulp-babel": "^8.0.0",
31-
"gulp-cache": "^1.1.3",
32-
"gulp-clean-css": "^4.3.0",
33-
"gulp-concat": "^2.6.1",
34-
"gulp-concat-css": "^3.1.0",
35-
"gulp-csscomb": "^3.1.0",
36-
"gulp-csso": "^4.0.1",
37-
"gulp-if": "^3.0.0",
38-
"gulp-imagemin": "^7.1.0",
39-
"gulp-minify-css": "^1.2.4",
40-
"gulp-plumber": "^1.2.1",
41-
"gulp-sass": "^4.1.1",
42-
"gulp-sourcemaps": "^3.0.0",
43-
"gulp-terser": "^2.0.1",
44-
"imagemin-jpeg-recompress": "^7.0.0",
45-
"imagemin-pngquant": "^9.0.2",
46-
"normalize.css": "^8.0.1",
47-
"rimraf": "^3.0.2",
48-
"sass": "^1.37.5"
22+
"@babel/core": "^7.14.2",
23+
"@babel/plugin-proposal-class-properties": "^7.13.0",
24+
"@babel/preset-env": "^7.14.2",
25+
"@babel/preset-react": "^7.13.13",
26+
"browser-sync": "^2.27.5",
27+
"del": "^6.0.0",
28+
"flickity": "^2.3.0",
29+
"gulp": "^4.0.2",
30+
"gulp-autoprefixer": "^7.0.1",
31+
"gulp-babel": "^8.0.0",
32+
"gulp-cache": "^1.1.3",
33+
"gulp-clean-css": "^4.3.0",
34+
"gulp-concat": "^2.6.1",
35+
"gulp-concat-css": "^3.1.0",
36+
"gulp-csscomb": "^3.1.0",
37+
"gulp-csso": "^4.0.1",
38+
"gulp-if": "^3.0.0",
39+
"gulp-imagemin": "^7.1.0",
40+
"gulp-minify-css": "^1.2.4",
41+
"gulp-plumber": "^1.2.1",
42+
"gulp-sass": "^5.1.0",
43+
"gulp-sourcemaps": "^3.0.0",
44+
"gulp-strip-comments": "^2.5.2",
45+
"gulp-uglify": "^3.0.2",
46+
"imagemin-jpeg-recompress": "^7.0.0",
47+
"imagemin-pngquant": "^9.0.2",
48+
"normalize.css": "^8.0.1",
49+
"rimraf": "^3.0.2"
4950
},
5051
"dependencies": {
51-
"@splidejs/splide": "^2.4.21"
52+
"@splidejs/splide": "^2.4.21"
5253
}
5354
}

themes/muzyka21/classes/core/class-acfblocks.php

+11
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,17 @@ static function acf_init()
7474
'keywords' => array('waves', 'banner'),
7575
));
7676

77+
acf_register_block(array(
78+
'name' => 'general-wavefix',
79+
//'enqueue_assets' => 'muzbanner_assets',
80+
'title' => __('General Wave Fix'),
81+
'description' => __('General Wave Fix'),
82+
'render_callback' => ['Core\ACFBlocks', 'block_render_callback'],
83+
'category' => 'formatting',
84+
'icon' => 'admin-comments',
85+
'keywords' => array('waves', 'banner'),
86+
));
87+
7788
acf_register_block(array(
7889
'name' => 'service-mainbanner',
7990
//'enqueue_assets' => 'muzbanner_assets',

themes/muzyka21/css/main.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

themes/muzyka21/js/main.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.wavefix {
2+
.wavestart, .wavesend {
3+
position: relative;
4+
height: 130px;
5+
width: 100%;
6+
background: #fff;
7+
display: block;
8+
}
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<div class="wavefix">
2+
<?php
3+
$class = get_field('waveclass');
4+
5+
if($class == 'start') : ?>
6+
<img class="wavestart" src="<?php echo get_template_directory_uri() . '/images/wave2start.svg'; ?>">
7+
<?php else if ($class == 'end') : ?>
8+
<img class="wavesend" src="<?php echo get_template_directory_uri() . '/images/wave2end.svg'; ?>">
9+
<?php endif; ?>
10+
</div>

0 commit comments

Comments
 (0)