Skip to content

Commit

Permalink
Task/phpv8.2 upgrade (#47) (#49)
Browse files Browse the repository at this point in the history
* Adds checks to header / footer

* More clean up

* Add comments

---------

Co-authored-by: Colin Bayer <ccbayer@Colins-MacBook-Pro.local>
  • Loading branch information
ccbayer and Colin Bayer committed Oct 8, 2023
1 parent ddf4e70 commit d830a78
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .bowerrc
@@ -0,0 +1,5 @@
{
"directory": "bower_components",
"registry": "https://registry.bower.io",
"strict-ssl": false
}
3 changes: 3 additions & 0 deletions .editorconfig
@@ -0,0 +1,3 @@
[*.php]
indent_style = space
indent_size = 2
2 changes: 1 addition & 1 deletion footer.php
Expand Up @@ -79,7 +79,7 @@ class="has-gtm"

<?php
$scripts = get_field('site_scripts', 'option');
if($scripts['footer_scripts']):
if(!empty($scripts) && $scripts['footer_scripts']):
?>
<script>
<?= $scripts['footer_scripts'] ?>
Expand Down
4 changes: 3 additions & 1 deletion header.php
Expand Up @@ -42,14 +42,16 @@
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', '<?= $gtm_id ?>');
<?php if($gtm_ga_config['conversion_ids']['phone_number']): ?>
gtag('config', '<?= $gtm_id ?>/<?= $gtm_ga_config['conversion_ids']['phone_number'] ?>', {
'phone_conversion_number': '312-379-0400'
});
<?php endif; ?>
</script>
<?php wp_head(); ?>
<?php
$scripts = get_field('site_scripts', 'option');
if($scripts['header_scripts']):
if(!empty($scripts) && $scripts['header_scripts']):
?>
<script>
<?= $scripts['header_scripts'] ?>
Expand Down
4 changes: 2 additions & 2 deletions page-templates/home.php
Expand Up @@ -11,14 +11,14 @@

<?php
$hero = get_field('hero_image');
$heroImage = 'style="background-image: url('.$hero[0]['hero_image_desktop']['url'].')"';
$heroImage = 'style="background-image: url('.$hero[0]['hero_image_desktop']['url'].')"; background-size: cover;';
if(get_field('show_hero_video') && get_field('hero_video')):
$heroImage = '';
endif;
?>

<div class="wrapper" id="home-page-wrapper">
<div class="home-banner pattern-overlay opacity-45" <?php echo $hero;?>>
<div class="home-banner pattern-overlay opacity-45" <?php echo $heroImage; ?>>
<div class="container">
<?php if(get_field('show_hero_video') && get_field('hero_video')): ?>
<div class="video-container">
Expand Down
13 changes: 13 additions & 0 deletions src/js/bootstrap4/npm.js
@@ -0,0 +1,13 @@
// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
require('../../js/transition.js')
require('../../js/alert.js')
require('../../js/button.js')
require('../../js/carousel.js')
require('../../js/collapse.js')
require('../../js/dropdown.js')
require('../../js/modal.js')
require('../../js/tooltip.js')
require('../../js/popover.js')
require('../../js/scrollspy.js')
require('../../js/tab.js')
require('../../js/affix.js')
4 changes: 4 additions & 0 deletions style.css
Expand Up @@ -2,6 +2,10 @@
Theme Name: Forth Group
Theme URI: http://forthgrp.com
Author: icoya
Version: 1.3
Requires at least: 6.0
Tested up to: 6.3.1
Requires PHP: 8.0
Author URI: http://www.ico-ya.com
Description: Customized theme for ForthGroup, based on understap
*/
Expand Down

0 comments on commit d830a78

Please sign in to comment.