diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..1bce2ec --- /dev/null +++ b/.babelrc @@ -0,0 +1,11 @@ +{ + "presets": [ + [ + "@babel/preset-env", + { + "useBuiltIns": "entry", + "corejs": "3.6" + } + ] + ] +} diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..e9e45a4 --- /dev/null +++ b/.env.example @@ -0,0 +1 @@ +BROWSERSYNC_PROXY_URL=http://tofino.test \ No newline at end of file diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..62c9489 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,32 @@ +module.exports = { + extends: ['airbnb', 'plugin:prettier/recommended', 'prettier/react'], + env: { + browser: true, + commonjs: true, + es6: true, + jest: true, + node: true, + }, + globals: { + tofinoJS: true, + }, + rules: { + // 'import/no-extraneous-dependencies': ['error', { devDependencies: true }], + 'jsx-a11y/href-no-hash': ['off'], + 'react/jsx-filename-extension': ['warn', { extensions: ['.js', '.jsx'] }], + 'max-len': [ + 'warn', + { + code: 100, + tabWidth: 2, + comments: 100, + ignoreComments: false, + ignoreTrailingComments: true, + ignoreUrls: true, + ignoreStrings: true, + ignoreTemplateLiterals: true, + ignoreRegExpLiterals: true, + }, + ], + }, +}; diff --git a/.gitignore b/.gitignore index 50cfc3c..67eb9a4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,11 +5,13 @@ !.gitignore !.gitkeep !.gitattributes -!.eslint.json -!.stylelintrc.json +!.eslintrc.js +!.stylelintrc.js !.editorconfig !.env -!.prettierrc +!.prettierrc.js +!.babelrc +!.env.example # ignore node/grunt dependency directories node_modules/ diff --git a/.prettierrc.js b/.prettierrc.js new file mode 100644 index 0000000..c67f1a9 --- /dev/null +++ b/.prettierrc.js @@ -0,0 +1,6 @@ +module.exports = { + printWidth: 100, + singleQuote: true, + semi: true, + trailingComma: 'es5', +} diff --git a/.stylelintrc.js b/.stylelintrc.js new file mode 100644 index 0000000..1e1fa3a --- /dev/null +++ b/.stylelintrc.js @@ -0,0 +1,24 @@ +module.exports = { + extends: 'stylelint-config-recommended', + 'prettier.stylelintIntegration': true, + rules: { + 'at-rule-no-unknown': [ + true, + { + ignoreAtRules: [ + 'tailwind', + 'apply', + 'variants', + 'responsive', + 'screen', + ], + }, + ], + 'selector-pseudo-class-no-unknown': [ + true, + { + ignorePseudoClasses: ['global'] + }, + ], + }, +}; diff --git a/CHANGELOG.md b/CHANGELOG.md index f746724..8dfb0a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,63 @@ -## Changelog - -### 1.8.0: Feb 21 2017 +# [3.1.0](https://github.com/creativedotdesign/tofino/compare/v3.0.0...v3.1.0) (2021-04-04) + +### Bug Fixes + +- ACF Correct JSON Paths. ([58edf47](https://github.com/creativedotdesign/tofino/commit/58edf477a1377f96f1d58c0aa6ccff3e810dfaf2)) +- Custom social icon order. Fixes [#294](https://github.com/creativedotdesign/tofino/issues/294). ([bbdabf2](https://github.com/creativedotdesign/tofino/commit/bbdabf2d24d63cddfa850fe13fe72ba153edc463)) +- Larger content width. ([08a66d3](https://github.com/creativedotdesign/tofino/commit/08a66d3dcf20674ffff2d39a62d3dc2d30c0a60f)) +- Menu tweaks. ([7781107](https://github.com/creativedotdesign/tofino/commit/77811079a501b0179cef436fa8fcd8cdeeb1fd0d)) +- Remove admin link to Customizr. ([e4c5544](https://github.com/creativedotdesign/tofino/commit/e4c5544e566f6b499446a918e4b86d312d9d8fed)) +- Update default footer. ([c624ecc](https://github.com/creativedotdesign/tofino/commit/c624ecc659b3b275b51c42980114c4df633d7fd6)) +- Update tracker URL to creativedot domain. ([bd8bd3f](https://github.com/creativedotdesign/tofino/commit/bd8bd3fbd8cfead3c6e3e27eb460e3d334d7caf6)) + +### Features + +- A working mobile menu. ([257b968](https://github.com/creativedotdesign/tofino/commit/257b968ef0692197a94f57308bd766e60c8ef2a2)) +- Cleaner assets loading + remove more junk. ([cf56ada](https://github.com/creativedotdesign/tofino/commit/cf56ada39f9c0181db7c5520afe51465adcfb9d8)) +- Cleaner WordPress markup and trimmed admin area. ([8a9c18a](https://github.com/creativedotdesign/tofino/commit/8a9c18a5feb64f0d65ae8e79a1f3e5b2857c1197)) +- Enable HTML for notification/alert content. ([f093a9b](https://github.com/creativedotdesign/tofino/commit/f093a9ba7b33ac064fb90531c4ac9a7df470b516)) +- Misc Tweaks. ([24f3658](https://github.com/creativedotdesign/tofino/commit/24f36580c14680ec381d698bcd5c3c484845d3c6)) +- Remove Google Plus from social icons. ([c078437](https://github.com/creativedotdesign/tofino/commit/c078437e502f2804d453b922d55eadab863909f4)) +- Remove IE Banner from header. ([5df3892](https://github.com/creativedotdesign/tofino/commit/5df3892011a0d4bc5efcaed9d87cd6fdbbdf3be6)) +- Tailwind-JIT and Build Changes. ([6690b7b](https://github.com/creativedotdesign/tofino/commit/6690b7b3c7622e8b59a82704df7fc1a1e557aa27)) +- Tidy Youtube SVG. ([7e1f343](https://github.com/creativedotdesign/tofino/commit/7e1f343743743d1dbfdd26427836bac57136d28c)) +- Update default Widget Text. ([4641327](https://github.com/creativedotdesign/tofino/commit/4641327ef0c309fbeb1cf05ef9f504279e0ffbb8)) + +# 3.0.0: Nov 25 2020 + +- Tailwind v2 +- Updated Dependencies +- Remove Bootstrap +- Major Cleanup + +# 2.0.0: Sept 12 2019 + +- New build scripts using Laravel-Mix +- Lot's of bug fixes +- Updated Boostrap to the latest version + +# 1.10.0: Aug 18 2017 + +- Cookie notification doesn't play well with cache #251 +- Update critical styles task #238 +- Theme option - hide nav on scroll down #218 +- Ajax Form Data - Export and Delete #242 + +# 1.9.0: Aug 16 2017 + +- Fragment Cache is broken #250 +- Update and require Node Version 6.x #249 +- Add taxonomy only template route #247 +- Fix PHP Linter to exclude template files #246 +- Fix dashboard widget theme option #244 +- Ajax Form Construct Data Sanitize #243 +- Submitting AjaxForm from localhost fails to save data #240 +- social svgs padding and fill="currentColor" #239 +- Add file timestamp to svg sprite. #237 +- Empty \$user_email_address in Contact form demo #236 +- Update CSS & JS for Bootstrap 4 Beta Release + +# 1.8.0: Feb 21 2017 - Rename .bitbucket-pipelines.yml #221 - Fix single quote converted to html attribute in AjaxForm #226 @@ -14,7 +71,7 @@ - Add truncate SCSS mixin - Update README files -### 1.7.0: Dec 2 2016 +# 1.7.0: Dec 2 2016 - New gulp tasks for performance / accessibility (PSI, WAVE, W3C) - New gulp task for tunneling (Ngrok), required for above gulp tasks. @@ -32,7 +89,7 @@ - Add page title helper function - Add template part with arguments help function -### 1.6.0: Feb 19 2016 +# 1.6.0: Feb 19 2016 - Update deps - Fix jQuery and Cookies JS module imports @@ -45,7 +102,7 @@ - AjaxForm, original button text if multiple buttons within form element - JS routes files aren't being watched -### 1.5.0: Sept 13 2016 +# 1.5.0: Sept 13 2016 - AjaxForm JS as ES6 module - Shrinkwrap NPM deps @@ -60,7 +117,7 @@ - Cleaner DOM routing for JS - Misc bug fixes -### 1.4.0: May 29 2016 +# 1.4.0: May 29 2016 - Fix tracker URL issue - Update NPM dependencies @@ -82,7 +139,7 @@ - Various minor bug fixes - Send custom email to user -### 1.3.0: Mar 31 2016 +# 1.3.0: Mar 31 2016 - SVG Shortcode documentation - Comment out unused Bootstrap components @@ -92,7 +149,7 @@ This release uses ES6 to include and call Javascript libraries. Browserify and Babelify are included in the scripts build task. -### 1.2.0: Mar 16 2016 +# 1.2.0: Mar 16 2016 - Refactor gulpfile.js and split gulp tasks (and use eslint) - Update npm dependencies @@ -107,13 +164,13 @@ This release uses ES6 to include and call Javascript libraries. Browserify and B - Include default social network links and icons - Misc bugfixes -### 1.1.0: Feb 19 2016 +# 1.1.0: Feb 19 2016 - Bugfixes and stabilize dependancies. - Readme updates - New: Critical CSS - New: jQuery move to footer -### 1.0.0: Jan 5 2016 +# 1.0.0: Jan 5 2016 Initial Release diff --git a/LICENSE.md b/LICENSE.md index 968b576..70bdba1 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ Copyright (c) Ben Word and Scott Walkinshaw from Roots/Sage - https://roots.io/ -Modifications and new functionality Copyright (c) Daniel Hewes from Lambda Creatives - https://lambdacreatives.com +Modifications and new functionality Copyright (c) Daniel Hewes from Creative Dot - https://creativedot.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/README.md b/README.md index 71d1f2c..4eecc01 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![devDependency Status](https://david-dm.org/creativedotdesign/tofino/dev-status.svg)](https://david-dm.org/creativedotdesign/tofino#info=devDependencies) + Tofino # Tofino @@ -6,20 +8,22 @@ A WordPress starter theme for jumpstarting custom theme development. Developed by [Daniel Hewes](https://github.com/danimalweb), [Jake Gully](https://github.com/mrchimp). +Ongoing development is sponsored by [Creative Dot](https://creativdotdesign.com) + Heavily inspired the by awesome WordPress starter theme [Sage](https://github.com/roots/sage) by [Roots](https://github.com/roots) from [Ben Word](https://github.com/retlehs) and [Scott Walkinshaw](https://github.com/swalkinshaw). ## Requirements -| Prerequisite | How to check | How to install | -| ------------------------- | ------------- | ----------------------------------------------- | -| PHP >= 7.0.0 | `php -v` | [php.net](http://php.net/manual/en/install.php) | -| Node.js >= 14.10.0 | `node -v` | [nodejs.org](http://nodejs.org/) | -| Composer >= 1.9.0 | `composer -V` | [getcomposer.org](http://getcomposer.org) | +| Prerequisite | How to check | How to install | +| ------------------ | ------------- | ----------------------------------------------- | +| PHP >= 7.3.0 | `php -v` | [php.net](http://php.net/manual/en/install.php) | +| Node.js >= 12.16.3 | `node -v` | [nodejs.org](http://nodejs.org/) | +| Composer >= 2.0.0 | `composer -V` | [getcomposer.org](http://getcomposer.org) | ## Installation -* Download the latest [tagged release](https://github.com/creativedotdesign/tofino/releases). -* Clone the git repo and run the following commands: +- Download the latest [tagged release](https://github.com/creativedotdesign/tofino/releases). +- Clone the git repo and run the following commands: ``` composer install @@ -31,36 +35,33 @@ Once you have activated the theme, access Theme Options (WP Customizer) update a ## Features -* [tailwindcss] (http://tailwindcss.com/)(v2.0) -* Multilingual ready (WPML) -* Responsive -* Theme Options via WP Customizer (Native) - * Admin login screen logo - * Custom Dashboard Widget - * Google Analytics - * Hotjar Tracking - * Social links - * Sticky menu - * Sticky footer - * Left/Center/Right menu positions - * Telephone number - * Email address - * Company number - * Footer text - * Notification text / EU Cookie notice with top/bottom positions - * Contact form with [Google reCAPTCHA](https://www.google.com/recaptcha) and custom email templates - * Data Tables for viewing data submitted via the contact form - * Maintenance mode - * jQuery in footer -* JS ES6 compatible via Babel and Browserify. -* [DOM-based routing](http://goo.gl/EUTi53) for DOM Ready and Window Ready via advanced router -* [Laravel Mix](https://laravel-mix.com/) build script d -* [Composer](https://getcomposer.org/) for PHP package management -* Namespaced functions -* Auto post type / slug based template routing -* Shortcodes -* [Web Font Loader](https://github.com/typekit/webfontloader) load Google, Typekit and custom fonts. -* Fragment Cache class +- [tailwindcss](http://tailwindcss.com/)(v2.0) +- Multilingual ready (WPML) +- Responsive +- Theme Options via WP Customizer (Native) + _ Admin login screen logo + _ Custom Dashboard Widget + _ Google Analytics + _ Social links + _ Sticky menu + _ Sticky footer + _ Left/Center/Right menu positions + _ Client Data (Address, Telephone number, Email address, Company number) + _ Footer text + _ Notification text / EU Cookie notice with top/bottom positions + _ Contact form with [Google reCAPTCHA](https://www.google.com/recaptcha) and custom email templates + _ Data Tables for viewing data submitted via the contact form + - Maintenance mode popup + - jQuery in footer +- JS ES6 compatible via Babel and Browserify. +- [DOM-based routing](http://goo.gl/EUTi53) for DOM Ready and Window Ready via advanced router +- [Laravel Mix](https://laravel-mix.com/) build script d +- [Composer](https://getcomposer.org/) for PHP package management +- Namespaced functions +- Auto post type / slug based template routing +- Shortcodes +- [Web Font Loader](https://github.com/typekit/webfontloader) load Google, Typekit and custom fonts. +- Fragment Cache class ## Documentation @@ -79,21 +80,21 @@ npm run prod The following files and directories should not be deployed on the server: ``` +.babelrc .editorconfig .env .git .github -.eslintrc.json +.eslintrc.js .gitignore .gitkeep .git-ftp-ignore .git-ftp-include .gitattributes .gitignore -.stylelintrc.yml -.hound.yml +.prettierrc.js +.stylelintrc.js assets -bin node_modules composer.json composer.lock @@ -101,7 +102,5 @@ package.json package-lock.json tailwind.config.js webpack.mix.js -ruleset.xml **/*.md -yarn.lock ``` diff --git a/assets/scripts/modules/menu.js b/assets/scripts/modules/menu.js new file mode 100644 index 0000000..ff5aa02 --- /dev/null +++ b/assets/scripts/modules/menu.js @@ -0,0 +1,32 @@ +// Scroll lock +import { disableBodyScroll, enableBodyScroll } from 'body-scroll-lock'; + +const Menu = () => { + // Menu Toggle + const buttons = document.querySelectorAll('.js-menu-toggle'), + menu = document.getElementById('main-menu'); + + buttons.forEach(el => { + el.addEventListener('click', () => { + // Toggle the hide class + menu.classList.toggle('hidden'); + + if (menu.classList.contains('hidden')) { + enableBodyScroll(menu); + } else { + disableBodyScroll(menu); + } + }); + }); + + // Close menu on ESC key + document.onkeydown = e => { + if (e.key === 'Escape' && !menu.classList.contains('hidden')) { + menu.classList.add('hidden'); + + disableBodyScroll(menu); + } + }; +}; + +export default Menu; diff --git a/assets/scripts/router.js b/assets/scripts/router.js index 90e07d7..c42d816 100644 --- a/assets/scripts/router.js +++ b/assets/scripts/router.js @@ -9,18 +9,18 @@ // The routing fires all common scripts, followed by the page specific scripts. // Add additional events for more control over timing e.g. a finalize event export default class Router { - constructor(routes) { + constructor (routes) { this.routes = routes; } - fire(route, fn = 'init', args) { + fire (route, fn = 'init', args) { const fire = route !== '' && this.routes[route] && typeof this.routes[route][fn] === 'function'; if (fire) { this.routes[route][fn](args); } } - loadEvents(type) { + loadEvents (type) { if (type == null) { this.fire('common'); // Fire common init JS } @@ -30,7 +30,7 @@ export default class Router { .toLowerCase() .replace(/-/g, '_') .split(/\s+/) - .forEach((className) => { + .forEach(className => { if (type == null) { this.fire(className); this.fire(className, 'finalize'); diff --git a/assets/scripts/routes/common.js b/assets/scripts/routes/common.js index 86d2a52..4575efb 100644 --- a/assets/scripts/routes/common.js +++ b/assets/scripts/routes/common.js @@ -1,19 +1,26 @@ // Import Alert import Alert from '../modules/alert'; +// Menu +import Menu from '../modules/menu'; + export default { - init() { + init () { // JavaScript to be fired on all pages // Alert if (document.body.contains(document.getElementById('tofino-notification'))) { Alert(); } + + if (document.body.contains(document.getElementById('main-menu'))) { + Menu(); + } }, - finalize() { + finalize () { // JavaScript to be fired on all pages, after page specific JS is fired }, - loaded() { + loaded () { // Javascript to be fired on page once fully loaded }, }; diff --git a/assets/scripts/wp-admin.js b/assets/scripts/wp-admin.js index 3082716..1e47d0d 100644 --- a/assets/scripts/wp-admin.js +++ b/assets/scripts/wp-admin.js @@ -1,10 +1,13 @@ import Cookies from 'js-cookie'; -(function ($) { - $(document).ready(function () { - $('.maintenance-mode-alert button').on('click', function () { +document.addEventListener('DOMContentLoaded', () => { + if (document.body.contains(document.querySelector('.maintenance-mode-alert'))) { + const button = document.querySelector('.maintenance-mode-alert button'); + + button.addEventListener('click', () => { Cookies.set('tofino_maintenance_alert_dismissed', 'true'); - $('.maintenance-mode-alert').fadeOut('fast'); + + document.querySelector('.maintenance-mode-alert').style.display = 'none'; }); - }); -}(jQuery)); + } +}); diff --git a/assets/styles/base/menu.css b/assets/styles/base/menu.css index b809e6b..0c733f5 100644 --- a/assets/styles/base/menu.css +++ b/assets/styles/base/menu.css @@ -1,4 +1,12 @@ /* Menu Styles */ .sticky-top { @apply sticky top-0; -} \ No newline at end of file +} + +#menu-header-menu { + @apply lg:inline-flex; + + .menu-item { + @apply lg:mr-4; + } +} diff --git a/assets/styles/base/social-icons.css b/assets/styles/base/social-icons.css index b9f8a02..b67d771 100644 --- a/assets/styles/base/social-icons.css +++ b/assets/styles/base/social-icons.css @@ -1,17 +1,15 @@ .social-icons { - list-style-type: none; - padding-left: 0; + @apply pl-0 list-none; li { - display: inline-block; + @apply inline-block; } svg { - width: 24px; - height: 24px; + @apply w-6 h-6; } a { - display: block; + @apply block; } } diff --git a/assets/styles/base/structure.css b/assets/styles/base/structure.css index c004134..f6009a9 100644 --- a/assets/styles/base/structure.css +++ b/assets/styles/base/structure.css @@ -1,30 +1,26 @@ html { - height: 100%; + @apply h-full; } body { - /* Flexbox supported browsers only. */ - -moz-font-feature-settings: 'kern'; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; + @apply antialiased; &.footer-sticky { - display: flex; - min-height: 100vh; - flex-direction: column; + @apply flex flex-col min-h-screen; .wrapper { flex: 1 0 auto; - width: 100%; + + @apply w-full; } } &.no-fout { - visibility: hidden; + @apply invisible; .wf-inactive &, .wf-active & { - visibility: visible; + @apply visible; } } } diff --git a/assets/styles/base/wp-admin.css b/assets/styles/base/wp-admin.css index 1874236..5592718 100644 --- a/assets/styles/base/wp-admin.css +++ b/assets/styles/base/wp-admin.css @@ -1,17 +1,13 @@ .maintenance-mode-alert { - background-color: red; - color: white; - position: fixed; - left: 0; - right: 0; - top: 0; - bottom: 0; + @apply fixed inset-0 p-5 text-center text-white bg-red-600; + z-index: 999999; - padding: 20px; - text-align: center; + + h1 { + @apply text-white; + } p { - font-size: 18px; + @apply text-sm; } } - diff --git a/assets/styles/main.css b/assets/styles/main.css index c1fe894..261a2d1 100644 --- a/assets/styles/main.css +++ b/assets/styles/main.css @@ -4,6 +4,7 @@ @import 'base/alerts'; @import 'base/menu'; +@import 'base/social-icons'; @import 'base/structure'; @import 'tailwindcss/utilities'; diff --git a/assets/styles/safelist.txt b/assets/styles/safelist.txt new file mode 100644 index 0000000..9d842f5 --- /dev/null +++ b/assets/styles/safelist.txt @@ -0,0 +1,7 @@ +sticky-top +alert +bottom +top +footer-sticky +menu-fixed +notification-use-js \ No newline at end of file diff --git a/assets/svgs/sprites/email.svg b/assets/svgs/sprites/email.svg index cdc8537..ec78391 100644 --- a/assets/svgs/sprites/email.svg +++ b/assets/svgs/sprites/email.svg @@ -1,7 +1,3 @@ - - - - - + + + \ No newline at end of file diff --git a/assets/svgs/sprites/facebook.svg b/assets/svgs/sprites/facebook.svg index 3177260..d07cd13 100644 --- a/assets/svgs/sprites/facebook.svg +++ b/assets/svgs/sprites/facebook.svg @@ -1,7 +1,3 @@ - - - - - + + + \ No newline at end of file diff --git a/assets/svgs/sprites/googleplus.svg b/assets/svgs/sprites/googleplus.svg deleted file mode 100644 index 125ee3e..0000000 --- a/assets/svgs/sprites/googleplus.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/assets/svgs/sprites/icon-close.svg b/assets/svgs/sprites/icon-close.svg index 53262e7..30725cf 100644 --- a/assets/svgs/sprites/icon-close.svg +++ b/assets/svgs/sprites/icon-close.svg @@ -1,16 +1,3 @@ - - - - - - - - + + + \ No newline at end of file diff --git a/assets/svgs/sprites/icon-hamburger.svg b/assets/svgs/sprites/icon-hamburger.svg new file mode 100644 index 0000000..05e9864 --- /dev/null +++ b/assets/svgs/sprites/icon-hamburger.svg @@ -0,0 +1,4 @@ + + Open Menu Icon + + \ No newline at end of file diff --git a/assets/svgs/sprites/instagram.svg b/assets/svgs/sprites/instagram.svg index 784b7a6..1609679 100644 --- a/assets/svgs/sprites/instagram.svg +++ b/assets/svgs/sprites/instagram.svg @@ -1,10 +1,3 @@ - - - - - + + + \ No newline at end of file diff --git a/assets/svgs/sprites/linkedin.svg b/assets/svgs/sprites/linkedin.svg index 0d45af1..b2a2e13 100644 --- a/assets/svgs/sprites/linkedin.svg +++ b/assets/svgs/sprites/linkedin.svg @@ -1,8 +1,4 @@ - - - - - - + + + + \ No newline at end of file diff --git a/assets/svgs/sprites/pinterest.svg b/assets/svgs/sprites/pinterest.svg index b33909b..a65e0fe 100644 --- a/assets/svgs/sprites/pinterest.svg +++ b/assets/svgs/sprites/pinterest.svg @@ -1,9 +1,3 @@ - - - - - + + + \ No newline at end of file diff --git a/assets/svgs/sprites/soundcloud.svg b/assets/svgs/sprites/soundcloud.svg index 1f26f61..33d4190 100644 --- a/assets/svgs/sprites/soundcloud.svg +++ b/assets/svgs/sprites/soundcloud.svg @@ -1,14 +1,3 @@ - - - - - + + + \ No newline at end of file diff --git a/assets/svgs/sprites/twitter.svg b/assets/svgs/sprites/twitter.svg index 4c49130..5df4655 100644 --- a/assets/svgs/sprites/twitter.svg +++ b/assets/svgs/sprites/twitter.svg @@ -1,8 +1,3 @@ - - - - - + + + \ No newline at end of file diff --git a/assets/svgs/sprites/vimeo.svg b/assets/svgs/sprites/vimeo.svg index d729cf7..5f81fc1 100644 --- a/assets/svgs/sprites/vimeo.svg +++ b/assets/svgs/sprites/vimeo.svg @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/assets/svgs/sprites/youtube.svg b/assets/svgs/sprites/youtube.svg index d5901d7..59c3e7c 100644 --- a/assets/svgs/sprites/youtube.svg +++ b/assets/svgs/sprites/youtube.svg @@ -1,7 +1,3 @@ - - - - - + + + \ No newline at end of file diff --git a/composer.json b/composer.json index 9d50e90..a4af5e8 100644 --- a/composer.json +++ b/composer.json @@ -16,14 +16,10 @@ "homepage": "https://github.com/mrchimp" } ], - "keywords": [ - "WordPress", - "theme", - "tofino" - ], + "keywords": ["WordPress", "theme", "tofino"], "require": { - "php": ">=7.2.0", - "composer/installers": "~1.9.0", + "php": ">=7.3.0", + "composer/installers": "~v1.10.0", "mindkomm/theme-lib-mix": "^1.1" }, "autoload": { diff --git a/composer.lock b/composer.lock index 829b4a7..25484b9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "16cd2e97d5151001d22b1acd17feee32", + "content-hash": "0bb1f66db0b022901f6df92fc9d11066", "packages": [ { "name": "composer/installers", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "b93bcf0fa1fccb0b7d176b0967d969691cd74cca" + "reference": "1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/b93bcf0fa1fccb0b7d176b0967d969691cd74cca", - "reference": "b93bcf0fa1fccb0b7d176b0967d969691cd74cca", + "url": "https://api.github.com/repos/composer/installers/zipball/1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d", + "reference": "1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d", "shasum": "" }, "require": { @@ -28,17 +28,18 @@ "shama/baton": "*" }, "require-dev": { - "composer/composer": "1.6.* || 2.0.*@dev", - "composer/semver": "1.0.* || 2.0.*@dev", - "phpunit/phpunit": "^4.8.36", - "sebastian/comparator": "^1.2.4", + "composer/composer": "1.6.* || ^2.0", + "composer/semver": "^1 || ^3", + "phpstan/phpstan": "^0.12.55", + "phpstan/phpstan-phpunit": "^0.12.16", + "symfony/phpunit-bridge": "^4.2 || ^5", "symfony/process": "^2.3" }, "type": "composer-plugin", "extra": { "class": "Composer\\Installers\\Plugin", "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "1.x-dev" } }, "autoload": { @@ -76,6 +77,7 @@ "Porto", "RadPHP", "SMF", + "Starbug", "Thelia", "Whmcs", "WolfCMS", @@ -116,6 +118,7 @@ "phpbb", "piwik", "ppi", + "processwire", "puppet", "pxcms", "reindex", @@ -131,7 +134,25 @@ "zend", "zikula" ], - "time": "2020-04-07T06:57:05+00:00" + "support": { + "issues": "https://github.com/composer/installers/issues", + "source": "https://github.com/composer/installers/tree/v1.10.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-01-14T11:07:16+00:00" }, { "name": "mindkomm/theme-lib-mix", @@ -168,6 +189,10 @@ } ], "description": "Laravel Mix functions for WordPress projects", + "support": { + "issues": "https://github.com/mindkomm/theme-lib-mix/issues", + "source": "https://github.com/mindkomm/theme-lib-mix/tree/1.1.0" + }, "time": "2019-02-08T18:43:17+00:00" } ], @@ -178,7 +203,8 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.2.0" + "php": ">=7.3.0" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "2.0.0" } diff --git a/footer.php b/footer.php index 32b3976..37b646f 100644 --- a/footer.php +++ b/footer.php @@ -7,7 +7,7 @@
-
diff --git a/functions.php b/functions.php index 0261817..36a3813 100644 --- a/functions.php +++ b/functions.php @@ -1,16 +1,4 @@ ['sprite_file' => $svg_url . '?v=' . filemtime($svg_file_path)] -]; - - /** * Tofino includes * @@ -25,6 +13,7 @@ "inc/lib/assets.php", "inc/lib/helpers.php", "inc/lib/clean.php", + "inc/lib/CustomizrTextEditor.php", "inc/shortcodes/copyright.php", "inc/shortcodes/social-icons.php", "inc/shortcodes/svg.php", @@ -92,21 +81,19 @@ function missing_dist_error_notice() {
- -