Skip to content

Commit cb1c301

Browse files
danimalwebdanimalweb
committed
Merge branch 'dev' into HEAD
2 parents c7fb778 + 488e577 commit cb1c301

22 files changed

+2044
-2480
lines changed

‎.git-ftp-ignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@ composer.json
1515
composer.lock
1616
package.json
1717
package-lock.json
18-
postcss.config.ts
18+
postcss.config.mjs
1919
tsconfig.json
2020
phpcs.xml
2121
\*\*/\_.md
2222
.prettierrc
23-
stylelint.config.ts
24-
tailwind.config.ts
2523
vite.config.ts

‎.github/workflows/dev.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
with:
1717
fetch-depth: 2
1818

19-
# Set up Node.js version 20
20-
- name: Set up Node.js 20
19+
# Set up Node.js version 22
20+
- name: Set up Node.js 22
2121
uses: actions/setup-node@v3
2222
with:
23-
node-version: '20'
23+
node-version: '22'
2424
cache: 'npm'
2525

2626
- name: Get Composer Cache Directory

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Heavily inspired the by awesome WordPress starter theme [Sage](https://github.co
1515
| Prerequisite | How to check | How to install |
1616
| ----------------- | ------------- | ----------------------------------------------- |
1717
| PHP >= 8.2.0 | `php -v` | [php.net](http://php.net/manual/en/install.php) |
18-
| Node.js >= 20.0.0 | `node -v` | [nodejs.org](http://nodejs.org/) |
18+
| Node.js >= 22.0.0 | `node -v` | [nodejs.org](http://nodejs.org/) |
1919
| Composer >= 2.0.0 | `composer -V` | [getcomposer.org](http://getcomposer.org) |
2020

2121
## Installation

‎footer.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
<?php
2+
// if (get_field('enable_cookie_notice', 'options')) {
3+
// \Tofino\Helpers\hm_get_template_part('../../plugins/tofino-cookie-notice/templates/tofino-cookie-notice');
4+
// }
5+
6+
?>
7+
18
<footer>
29
<div class="container">
310
<div class="w-full text-center"><?php
@@ -27,5 +34,7 @@
2734

2835
<?php Tofino\Init\alerts('bottom'); ?>
2936

37+
<?php do_action('tofino_after_footer'); ?>
38+
3039
</body>
3140
</html>

‎header.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
$scroll_reveal = get_field('menu_scroll_reveal', 'general-options'); ?>
2+
$scroll_reveal = get_field('menu_scroll_reveal', 'options'); ?>
33

44
<!doctype html>
55
<html <?php language_attributes(); ?>>
@@ -21,7 +21,7 @@
2121
$menu_sticky = Tofino\Init\menu_sticky(); ?>
2222

2323
<header <?php echo ($scroll_reveal ? 'data-scroll-reveal' : ''); ?>
24-
class="duration-500 transition-transform transform-gpu <?php echo Tofino\Init\menu_sticky(); ?>"
24+
class="duration-500 transition-transform transform-gpu <?php echo ($menu_sticky ? $menu_sticky : ''); ?>"
2525
>
2626
<nav class="flex justify-between w-full px-6 py-4 bg-gray-100">
2727
<a href="<?php echo esc_url(home_url()); ?>" title="<?php echo esc_attr(bloginfo('name')); ?>">

‎inc/acf-json/group_62583ddaa0897.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@
5050
"acfe_clone_modal": 0,
5151
"acfe_clone_modal_close": 0,
5252
"acfe_clone_modal_button": "",
53-
"acfe_clone_modal_size": "large"
53+
"acfe_clone_modal_size": "large",
54+
"wpml_cf_preferences": 1
5455
}
5556
],
5657
"min": "",
@@ -94,7 +95,8 @@
9495
"acfe_flexible_modal_size": "full",
9596
"acfe_flexible_modal_col": "4",
9697
"acfe_flexible_modal_categories": false
97-
}
98+
},
99+
"wpml_cf_preferences": 1
98100
}
99101
],
100102
"location": [
@@ -131,12 +133,13 @@
131133
"acfe_autosync": [
132134
"json"
133135
],
136+
"acfml_field_group_mode": "translation",
134137
"acfe_form": 0,
135138
"show_in_graphql": 0,
136139
"graphql_field_name": "__pageModules",
137140
"map_graphql_types_from_location_rules": 0,
138141
"graphql_types": "",
139142
"acfe_meta": "",
140143
"acfe_note": "",
141-
"modified": 1729892148
144+
"modified": 1733440203
142145
}

‎inc/acf-json/group_653fdd4a51868.json

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"label": "Text",
88
"name": "footer_text",
99
"aria-label": "",
10-
"type": "textarea",
10+
"type": "wysiwyg",
1111
"instructions": "",
1212
"required": 0,
1313
"conditional_logic": 0,
@@ -16,13 +16,17 @@
1616
"class": "",
1717
"id": ""
1818
},
19-
"default_value": "[copyright]",
20-
"acfe_textarea_code": 0,
21-
"maxlength": "",
22-
"rows": 4,
23-
"placeholder": "",
24-
"new_lines": "",
25-
"wpml_cf_preferences": 2
19+
"wpml_cf_preferences": 0,
20+
"default_value": "",
21+
"allow_in_bindings": 1,
22+
"tabs": "all",
23+
"toolbar": "full",
24+
"media_upload": 0,
25+
"delay": 0,
26+
"show_in_graphql": 1,
27+
"graphql_description": "",
28+
"graphql_field_name": "footerText",
29+
"graphql_non_null": 0
2630
}
2731
],
2832
"location": [
@@ -36,7 +40,7 @@
3640
],
3741
"menu_order": 0,
3842
"position": "normal",
39-
"style": "seamless",
43+
"style": "default",
4044
"label_placement": "left",
4145
"instruction_placement": "label",
4246
"hide_on_screen": "",
@@ -47,14 +51,15 @@
4751
"acfe_autosync": [
4852
"json"
4953
],
54+
"acfml_field_group_mode": "advanced",
5055
"acfe_form": 0,
51-
"show_in_graphql": 0,
56+
"show_in_graphql": 1,
5257
"graphql_field_name": "footer",
5358
"map_graphql_types_from_location_rules": 0,
5459
"graphql_types": "",
5560
"acfe_meta": "",
5661
"acfe_note": "",
57-
"modified": 1726758726,
62+
"modified": 1750864816,
5863
"acfe_categories": {
5964
"options": "Options"
6065
}

0 commit comments

Comments
 (0)