Merge pull request #295 from creativedotdesign/dev

v3.1.0
creativedotdesign · Apr 4, 2021 · 013c823 · 013c823
2 parents 7d2b116 + f089c39
commit 013c823
Show file tree

Hide file tree

Showing 54 changed files with 15,505 additions and 12,152 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,11 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "useBuiltIns": "entry",
+        "corejs": "3.6"
+      }
+    ]
+  ]
+}
diff --git a/.env.example b/.env.example
@@ -0,0 +1 @@
+BROWSERSYNC_PROXY_URL=http://tofino.test
diff --git a/.eslintrc.js 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
@@ -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
@@ -0,0 +1,6 @@
+module.exports = {
+  printWidth: 100,
+  singleQuote: true,
+  semi: true,
+  trailingComma: 'es5',
+}
diff --git a/.stylelintrc.js 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
@@ -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
@@ -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
@@ -1,3 +1,5 @@
+[![devDependency Status](https://david-dm.org/creativedotdesign/tofino/dev-status.svg)](https://david-dm.org/creativedotdesign/tofino#info=devDependencies)
+
 <img src="https://raw.githubusercontent.com/creativedotdesign/tofino/master/screenshot.png" alt="Tofino" width="500">
 
 # 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,29 +80,27 @@ 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
 package.json
 package-lock.json
 tailwind.config.js
 webpack.mix.js
-ruleset.xml
 **/*.md
-yarn.lock
 ```