diff --git a/.distignore b/.distignore new file mode 100644 index 0000000..602a1b6 --- /dev/null +++ b/.distignore @@ -0,0 +1,13 @@ +/.git +/.github +/node_modules +/vendor +/.distignore +/.editorconfig +/.gitignore +/.stylelintrc.json +/composer.json +/composer.lock +/package.json +/package-lock.json +/phpcs.xml diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..c6f3cf4 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,24 @@ +# This file is for unifying the coding style for different editors and IDEs +# editorconfig.org + +# WordPress Coding Standards +# https://make.wordpress.org/core/handbook/coding-standards/ + +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +indent_style = tab + +[*.yml] +indent_style = space +indent_size = 2 + +[*.md] +trim_trailing_whitespace = false + +[{*.txt,wp-config-sample.php}] +end_of_line = crlf diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d774b17..4974505 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,20 +1,22 @@ name: deploy -on: [push] +on: + push: + branches: + - main jobs: - run: - name: deploy + deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # Compile CSS - name: Compile style CSS - uses: gha-utilities/sass-build@v0.2.5 + uses: gha-utilities/sass-build@v0.6.0 with: source: assets/scss/style.scss destination: style.css outputStyle: expanded - name: Compile style CSS compressed - uses: gha-utilities/sass-build@v0.2.5 + uses: gha-utilities/sass-build@v0.6.0 with: source: assets/scss/style.scss destination: style.min.css @@ -26,5 +28,7 @@ jobs: key: ${{ secrets.SSH_PRIVATE_KEY }} known_hosts: ${{ secrets.KNOWN_HOSTS }} # Transfer file to remote server - - run: ssh ${{ secrets.REMOTE_USER }}@${{ secrets.REMOTE_HOST }} "mkdir -p ${{ secrets.REMOTE_PATH_BASE }}" - - run: rsync -ahv * ${{ secrets.REMOTE_USER }}@${{ secrets.REMOTE_HOST }}:${{ secrets.REMOTE_PATH_BASE }} \ No newline at end of file + - name: Deploy + run: | + ssh ${{ secrets.REMOTE_USER }}@${{ secrets.REMOTE_HOST }} "mkdir -p ${{ secrets.REMOTE_PATH_BASE }}" + rsync -ahv --exclude-from="$GITHUB_WORKSPACE/.distignore" --delete-excluded "$GITHUB_WORKSPACE/" ${{ secrets.REMOTE_USER }}@${{ secrets.REMOTE_HOST }}:${{ secrets.REMOTE_PATH_BASE }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..db168bf --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,24 @@ +name: Tests +on: [push, pull_request] +jobs: + quality: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: '8.2' + tools: composer + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version: '20' + - name: Code style checks for PHP + run: | + composer install + composer lint-php + - name: Code style checks for SCSS + run: | + npm ci + npm run lint-scss diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c732a3a --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/.idea +/*.css +/node_modules +/vendor diff --git a/.stylelintrc.json b/.stylelintrc.json new file mode 100644 index 0000000..4f51a10 --- /dev/null +++ b/.stylelintrc.json @@ -0,0 +1,7 @@ +{ + "extends": "@wordpress/stylelint-config/scss", + "rules": { + "no-descending-specificity": null, + "value-keyword-case": null + } +} diff --git a/assets/scss/elements/_buttons.scss b/assets/scss/elements/_buttons.scss index 422a099..c55c0d5 100644 --- a/assets/scss/elements/_buttons.scss +++ b/assets/scss/elements/_buttons.scss @@ -7,7 +7,7 @@ input[type="submit"], #page #infinite-handle button { background-color: $color__link; font-family: $font__family-body; - + &:active, &:focus, &:hover { diff --git a/assets/scss/elements/_elements.scss b/assets/scss/elements/_elements.scss index 46e81fc..64423a4 100644 --- a/assets/scss/elements/_elements.scss +++ b/assets/scss/elements/_elements.scss @@ -1 +1 @@ -@import 'buttons'; +@import "buttons"; diff --git a/assets/scss/layout/_blocks.scss b/assets/scss/layout/_blocks.scss index b31d0f0..01bbdee 100644 --- a/assets/scss/layout/_blocks.scss +++ b/assets/scss/layout/_blocks.scss @@ -1,14 +1,15 @@ .wp-block-columns { flex-wrap: wrap; - + @media (min-width: 500px) { flex-wrap: nowrap; } - + &.has-4-columns { + > .wp-block-column { flex-basis: 50%; - + @media (min-width: 500px) { flex: 0 0 25%; } @@ -21,19 +22,20 @@ } .real-people { + &.real-people { // needs to override common.css from Atomic Blocks display: flex; } - + .wp-block-column { width: auto; } - + .wp-block-image { margin: 0 auto; padding: 5px; } - + img { border-radius: 50%; display: block; @@ -42,7 +44,7 @@ margin: 0 auto; width: 90px; } - + + h1, + h2, + h3, diff --git a/assets/scss/layout/_blog.scss b/assets/scss/layout/_blog.scss index 02f9226..3b7ed4a 100644 --- a/assets/scss/layout/_blog.scss +++ b/assets/scss/layout/_blog.scss @@ -1,7 +1,7 @@ .entry-content .meta-list a { box-shadow: inset 0 -1px 0 $color__link; color: $color__link; - + &:hover { box-shadow: inset 0 -2px 0 $color__link; } diff --git a/assets/scss/layout/_font-face.scss b/assets/scss/layout/_font-face.scss index 8f6ad47..44715f2 100644 --- a/assets/scss/layout/_font-face.scss +++ b/assets/scss/layout/_font-face.scss @@ -2,7 +2,9 @@ font-family: "Fira Sans"; font-style: normal; font-weight: 400; - src: local('Fira Sans Regular'), local('FiraSans-Regular'), - url('assets/fonts/fira-sans-v8-latin-regular.woff2') format('woff2'), - url('assets/fonts/fira-sans-v8-latin-regular.woff') format('woff'); -} \ No newline at end of file + src: + local("Fira Sans Regular"), + local("FiraSans-Regular"), + url(assets/fonts/fira-sans-v8-latin-regular.woff2) format("woff2"), + url(assets/fonts/fira-sans-v8-latin-regular.woff) format("woff"); +} diff --git a/assets/scss/layout/_footer.scss b/assets/scss/layout/_footer.scss index 0734538..cc9c0f1 100644 --- a/assets/scss/layout/_footer.scss +++ b/assets/scss/layout/_footer.scss @@ -1,47 +1,50 @@ +@use "sass:color"; + .site-footer { - background-color: darken($color__header-background, 5); + background-color: color.adjust($color__header-background, $lightness: -5%); color: $color__header-link; padding-bottom: 40px; - + a, .widget-title { color: $color__header-link; } - + a:hover { color: $color__header-link-active; } - + input[type="text"] { - background-color: darken($color__header-background, 10); - border-color: darken($color__header-background, 15); - + background-color: color.adjust($color__header-background, $lightness: -10%); + border-color: color.adjust($color__header-background, $lightness: -15%); + &:active, &:focus, &:hover { - border-color: darken($color__header-background, 25); - box-shadow: inset 0 0 4px darken($color__header-background, 15); + border-color: color.adjust($color__header-background, $lightness: -25%); + box-shadow: inset 0 0 4px color.adjust($color__header-background, $lightness: -15%); color: $color__header-link; } } - + .searchform .searchsubmit { color: $color__header-link; - + &:active, &:focus, &:hover { - background-color: darken($color__header-background, 15) !important; + background-color: color.adjust($color__header-background, $lightness: -15%) !important; box-shadow: none; } } } .footer-widgets { + .footer-column { padding-top: 40px; } - + + .footer-bottom { border-top: 0; padding-top: 0; diff --git a/assets/scss/layout/_global.scss b/assets/scss/layout/_global.scss index cf4e5ba..8fbcb4e 100644 --- a/assets/scss/layout/_global.scss +++ b/assets/scss/layout/_global.scss @@ -45,15 +45,16 @@ p, } .entry-content { + ol, ul { margin-left: 0; margin-bottom: 2.4em; } - + p a { box-shadow: inset 0 -1px 0 $color__link; - + &:hover { box-shadow: inset 0 -2px 0 $color__link; } @@ -66,10 +67,11 @@ p, // we don’t include Font Awesome .searchform .searchsubmit { + span { display: inherit; } - + .fa { display: none; } diff --git a/assets/scss/layout/_posts.scss b/assets/scss/layout/_posts.scss index 456b380..6931f71 100644 --- a/assets/scss/layout/_posts.scss +++ b/assets/scss/layout/_posts.scss @@ -3,15 +3,17 @@ } #page { + .alignright, .alignleft { + img { display: block; margin-left: auto; margin-right: auto; max-width: 100%; width: auto; - + @media (min-width: 601px) { display: inline; } diff --git a/assets/scss/navigation/_navigation.scss b/assets/scss/navigation/_navigation.scss index e096b91..7115052 100644 --- a/assets/scss/navigation/_navigation.scss +++ b/assets/scss/navigation/_navigation.scss @@ -1,26 +1,29 @@ +@use "sass:color"; + .main-navigation { font-size: $size__font-copy; - + a { color: $color__header-link; font-family: $font__family-headline; font-weight: 400; - + &:hover { color: $color__header-link-active; } } - + ul li { + a { line-height: $size__header; margin-bottom: 0; } - + &.mlp-language-nav-item { padding: 0 5px 0 15px; } - + &.mlp-language-current a { border-bottom: 1px solid #fff; line-height: 20px; @@ -33,25 +36,26 @@ li.mlp-language-nav-item + li.mlp-language-nav-item { } .mobile-navigation { - background-color: darken($color__header-background, 10); + background-color: color.adjust($color__header-background, $lightness: -10%); } .drawer-wrap .searchform { + .search-input { - background-color: darken($color__header-background, 10); + background-color: color.adjust($color__header-background, $lightness: -10%); color: $color__header-link; - + &:active, &:focus, &:hover { - box-shadow: inset 0 0 4px darken($color__header-background, 20); + box-shadow: inset 0 0 4px color.adjust($color__header-background, $lightness: -20%); color: $color__header-link; } } - + .searchsubmit { color: $color__header-link; - + &:active, &:focus, &:hover { diff --git a/assets/scss/style.scss b/assets/scss/style.scss index c349489..11978e7 100644 --- a/assets/scss/style.scss +++ b/assets/scss/style.scss @@ -14,7 +14,7 @@ Use it to make something cool, have fun, and share what you've learned with othe */ @import "layout/font-face"; -@import 'variables/variables'; -@import 'layout/layout'; -@import 'elements/elements'; -@import 'navigation/navigation'; +@import "variables/variables"; +@import "layout/layout"; +@import "elements/elements"; +@import "navigation/navigation"; diff --git a/assets/scss/variables/_typography.scss b/assets/scss/variables/_typography.scss index 19d4c07..f8f8f41 100644 --- a/assets/scss/variables/_typography.scss +++ b/assets/scss/variables/_typography.scss @@ -1,6 +1,6 @@ $font__family-body: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; $font__family-headline: "Fira Sans"; -$font__family-monospace: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;; +$font__family-monospace: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace; $font__line-height-body: 1.6; $font__line-height-headline: 1.1; diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..fbfdac1 --- /dev/null +++ b/composer.json @@ -0,0 +1,44 @@ +{ + "name": "pluginkollektiv/lovelace", + "type": "wordpress-theme", + "license": "GPL-2.0+", + "description": "Atomic Blocks child theme for pluginkollektiv.org", + "homepage": "https://pluginkollektiv.org/", + "authors": [ + { + "name": "pluginkollektiv", + "homepage": "https://github.com/pluginkollektiv" + } + ], + "keywords": [ + "wordpress", "wordpress-theme" + ], + "support": { + "issues": "https://github.com/pluginkollektiv/lovelace", + "forum": "https://wordpress.org/support/plugin/lovelace" + }, + "require": { + "php": ">=5.6.0", + "composer/installers": "^v2.3.0" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^v1.0.0", + "squizlabs/php_codesniffer": "^3.11.0", + "phpcompatibility/phpcompatibility-wp": "^2.1.5", + "wp-coding-standards/wpcs": "^3.1.0" + }, + "scripts": { + "lint-css": [ + "npx stylelint assets/scss" + ], + "lint-php": [ + "phpcs --standard=phpcs.xml -s" + ] + }, + "config": { + "allow-plugins": { + "composer/installers": true, + "dealerdirect/phpcodesniffer-composer-installer": true + } + } +} diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..a66739c --- /dev/null +++ b/composer.lock @@ -0,0 +1,762 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "3e06887b202dd2d6d5133d7e56f02854", + "packages": [ + { + "name": "composer/installers", + "version": "v2.3.0", + "source": { + "type": "git", + "url": "https://github.com/composer/installers.git", + "reference": "12fb2dfe5e16183de69e784a7b84046c43d97e8e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/installers/zipball/12fb2dfe5e16183de69e784a7b84046c43d97e8e", + "reference": "12fb2dfe5e16183de69e784a7b84046c43d97e8e", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0", + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "composer/composer": "^1.10.27 || ^2.7", + "composer/semver": "^1.7.2 || ^3.4.0", + "phpstan/phpstan": "^1.11", + "phpstan/phpstan-phpunit": "^1", + "symfony/phpunit-bridge": "^7.1.1", + "symfony/process": "^5 || ^6 || ^7" + }, + "type": "composer-plugin", + "extra": { + "class": "Composer\\Installers\\Plugin", + "branch-alias": { + "dev-main": "2.x-dev" + }, + "plugin-modifies-install-path": true + }, + "autoload": { + "psr-4": { + "Composer\\Installers\\": "src/Composer/Installers" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kyle Robinson Young", + "email": "kyle@dontkry.com", + "homepage": "https://github.com/shama" + } + ], + "description": "A multi-framework Composer library installer", + "homepage": "https://composer.github.io/installers/", + "keywords": [ + "Dolibarr", + "Eliasis", + "Hurad", + "ImageCMS", + "Kanboard", + "Lan Management System", + "MODX Evo", + "MantisBT", + "Mautic", + "Maya", + "OXID", + "Plentymarkets", + "Porto", + "RadPHP", + "SMF", + "Starbug", + "Thelia", + "Whmcs", + "WolfCMS", + "agl", + "annotatecms", + "attogram", + "bitrix", + "cakephp", + "chef", + "cockpit", + "codeigniter", + "concrete5", + "concreteCMS", + "croogo", + "dokuwiki", + "drupal", + "eZ Platform", + "elgg", + "expressionengine", + "fuelphp", + "grav", + "installer", + "itop", + "known", + "kohana", + "laravel", + "lavalite", + "lithium", + "magento", + "majima", + "mako", + "matomo", + "mediawiki", + "miaoxing", + "modulework", + "modx", + "moodle", + "osclass", + "pantheon", + "phpbb", + "piwik", + "ppi", + "processwire", + "puppet", + "pxcms", + "reindex", + "roundcube", + "shopware", + "silverstripe", + "sydes", + "sylius", + "tastyigniter", + "wordpress", + "yawik", + "zend", + "zikula" + ], + "support": { + "issues": "https://github.com/composer/installers/issues", + "source": "https://github.com/composer/installers/tree/v2.3.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": "2024-06-24T20:46:46+00:00" + } + ], + "packages-dev": [ + { + "name": "dealerdirect/phpcodesniffer-composer-installer", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/PHPCSStandards/composer-installer.git", + "reference": "4be43904336affa5c2f70744a348312336afd0da" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/4be43904336affa5c2f70744a348312336afd0da", + "reference": "4be43904336affa5c2f70744a348312336afd0da", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0", + "php": ">=5.4", + "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0" + }, + "require-dev": { + "composer/composer": "*", + "ext-json": "*", + "ext-zip": "*", + "php-parallel-lint/php-parallel-lint": "^1.3.1", + "phpcompatibility/php-compatibility": "^9.0", + "yoast/phpunit-polyfills": "^1.0" + }, + "type": "composer-plugin", + "extra": { + "class": "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin" + }, + "autoload": { + "psr-4": { + "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Franck Nijhof", + "email": "franck.nijhof@dealerdirect.com", + "homepage": "http://www.frenck.nl", + "role": "Developer / IT Manager" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/composer-installer/graphs/contributors" + } + ], + "description": "PHP_CodeSniffer Standards Composer Installer Plugin", + "homepage": "http://www.dealerdirect.com", + "keywords": [ + "PHPCodeSniffer", + "PHP_CodeSniffer", + "code quality", + "codesniffer", + "composer", + "installer", + "phpcbf", + "phpcs", + "plugin", + "qa", + "quality", + "standard", + "standards", + "style guide", + "stylecheck", + "tests" + ], + "support": { + "issues": "https://github.com/PHPCSStandards/composer-installer/issues", + "source": "https://github.com/PHPCSStandards/composer-installer" + }, + "time": "2023-01-05T11:28:13+00:00" + }, + { + "name": "phpcompatibility/php-compatibility", + "version": "9.3.5", + "source": { + "type": "git", + "url": "https://github.com/PHPCompatibility/PHPCompatibility.git", + "reference": "9fb324479acf6f39452e0655d2429cc0d3914243" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243", + "reference": "9fb324479acf6f39452e0655d2429cc0d3914243", + "shasum": "" + }, + "require": { + "php": ">=5.3", + "squizlabs/php_codesniffer": "^2.3 || ^3.0.2" + }, + "conflict": { + "squizlabs/php_codesniffer": "2.6.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0" + }, + "suggest": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.", + "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." + }, + "type": "phpcodesniffer-standard", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Wim Godden", + "homepage": "https://github.com/wimg", + "role": "lead" + }, + { + "name": "Juliette Reinders Folmer", + "homepage": "https://github.com/jrfnl", + "role": "lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors" + } + ], + "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.", + "homepage": "http://techblog.wimgodden.be/tag/codesniffer/", + "keywords": [ + "compatibility", + "phpcs", + "standards" + ], + "support": { + "issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues", + "source": "https://github.com/PHPCompatibility/PHPCompatibility" + }, + "time": "2019-12-27T09:44:58+00:00" + }, + { + "name": "phpcompatibility/phpcompatibility-paragonie", + "version": "1.3.3", + "source": { + "type": "git", + "url": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie.git", + "reference": "293975b465e0e709b571cbf0c957c6c0a7b9a2ac" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/293975b465e0e709b571cbf0c957c6c0a7b9a2ac", + "reference": "293975b465e0e709b571cbf0c957c6c0a7b9a2ac", + "shasum": "" + }, + "require": { + "phpcompatibility/php-compatibility": "^9.0" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^1.0", + "paragonie/random_compat": "dev-master", + "paragonie/sodium_compat": "dev-master" + }, + "suggest": { + "dealerdirect/phpcodesniffer-composer-installer": "^1.0 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." + }, + "type": "phpcodesniffer-standard", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Wim Godden", + "role": "lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "lead" + } + ], + "description": "A set of rulesets for PHP_CodeSniffer to check for PHP cross-version compatibility issues in projects, while accounting for polyfills provided by the Paragonie polyfill libraries.", + "homepage": "http://phpcompatibility.com/", + "keywords": [ + "compatibility", + "paragonie", + "phpcs", + "polyfill", + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/issues", + "security": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/security/policy", + "source": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie" + }, + "funding": [ + { + "url": "https://github.com/PHPCompatibility", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-04-24T21:30:46+00:00" + }, + { + "name": "phpcompatibility/phpcompatibility-wp", + "version": "2.1.5", + "source": { + "type": "git", + "url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git", + "reference": "01c1ff2704a58e46f0cb1ca9d06aee07b3589082" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/01c1ff2704a58e46f0cb1ca9d06aee07b3589082", + "reference": "01c1ff2704a58e46f0cb1ca9d06aee07b3589082", + "shasum": "" + }, + "require": { + "phpcompatibility/php-compatibility": "^9.0", + "phpcompatibility/phpcompatibility-paragonie": "^1.0" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^1.0" + }, + "suggest": { + "dealerdirect/phpcodesniffer-composer-installer": "^1.0 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." + }, + "type": "phpcodesniffer-standard", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Wim Godden", + "role": "lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "lead" + } + ], + "description": "A ruleset for PHP_CodeSniffer to check for PHP cross-version compatibility issues in projects, while accounting for polyfills provided by WordPress.", + "homepage": "http://phpcompatibility.com/", + "keywords": [ + "compatibility", + "phpcs", + "standards", + "static analysis", + "wordpress" + ], + "support": { + "issues": "https://github.com/PHPCompatibility/PHPCompatibilityWP/issues", + "security": "https://github.com/PHPCompatibility/PHPCompatibilityWP/security/policy", + "source": "https://github.com/PHPCompatibility/PHPCompatibilityWP" + }, + "funding": [ + { + "url": "https://github.com/PHPCompatibility", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-04-24T21:37:59+00:00" + }, + { + "name": "phpcsstandards/phpcsextra", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/PHPCSStandards/PHPCSExtra.git", + "reference": "11d387c6642b6e4acaf0bd9bf5203b8cca1ec489" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCSStandards/PHPCSExtra/zipball/11d387c6642b6e4acaf0bd9bf5203b8cca1ec489", + "reference": "11d387c6642b6e4acaf0bd9bf5203b8cca1ec489", + "shasum": "" + }, + "require": { + "php": ">=5.4", + "phpcsstandards/phpcsutils": "^1.0.9", + "squizlabs/php_codesniffer": "^3.8.0" + }, + "require-dev": { + "php-parallel-lint/php-console-highlighter": "^1.0", + "php-parallel-lint/php-parallel-lint": "^1.3.2", + "phpcsstandards/phpcsdevcs": "^1.1.6", + "phpcsstandards/phpcsdevtools": "^1.2.1", + "phpunit/phpunit": "^4.5 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + }, + "type": "phpcodesniffer-standard", + "extra": { + "branch-alias": { + "dev-stable": "1.x-dev", + "dev-develop": "1.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Juliette Reinders Folmer", + "homepage": "https://github.com/jrfnl", + "role": "lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHPCSExtra/graphs/contributors" + } + ], + "description": "A collection of sniffs and standards for use with PHP_CodeSniffer.", + "keywords": [ + "PHP_CodeSniffer", + "phpcbf", + "phpcodesniffer-standard", + "phpcs", + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/PHPCSStandards/PHPCSExtra/issues", + "security": "https://github.com/PHPCSStandards/PHPCSExtra/security/policy", + "source": "https://github.com/PHPCSStandards/PHPCSExtra" + }, + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2023-12-08T16:49:07+00:00" + }, + { + "name": "phpcsstandards/phpcsutils", + "version": "1.0.12", + "source": { + "type": "git", + "url": "https://github.com/PHPCSStandards/PHPCSUtils.git", + "reference": "87b233b00daf83fb70f40c9a28692be017ea7c6c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/87b233b00daf83fb70f40c9a28692be017ea7c6c", + "reference": "87b233b00daf83fb70f40c9a28692be017ea7c6c", + "shasum": "" + }, + "require": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7 || ^1.0", + "php": ">=5.4", + "squizlabs/php_codesniffer": "^3.10.0 || 4.0.x-dev@dev" + }, + "require-dev": { + "ext-filter": "*", + "php-parallel-lint/php-console-highlighter": "^1.0", + "php-parallel-lint/php-parallel-lint": "^1.3.2", + "phpcsstandards/phpcsdevcs": "^1.1.6", + "yoast/phpunit-polyfills": "^1.1.0 || ^2.0.0" + }, + "type": "phpcodesniffer-standard", + "extra": { + "branch-alias": { + "dev-stable": "1.x-dev", + "dev-develop": "1.x-dev" + } + }, + "autoload": { + "classmap": [ + "PHPCSUtils/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Juliette Reinders Folmer", + "homepage": "https://github.com/jrfnl", + "role": "lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHPCSUtils/graphs/contributors" + } + ], + "description": "A suite of utility functions for use with PHP_CodeSniffer", + "homepage": "https://phpcsutils.com/", + "keywords": [ + "PHP_CodeSniffer", + "phpcbf", + "phpcodesniffer-standard", + "phpcs", + "phpcs3", + "standards", + "static analysis", + "tokens", + "utility" + ], + "support": { + "docs": "https://phpcsutils.com/", + "issues": "https://github.com/PHPCSStandards/PHPCSUtils/issues", + "security": "https://github.com/PHPCSStandards/PHPCSUtils/security/policy", + "source": "https://github.com/PHPCSStandards/PHPCSUtils" + }, + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-05-20T13:34:27+00:00" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "3.11.0", + "source": { + "type": "git", + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "70c08f8d20c0eb4fe56f26644dd94dae76a7f450" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/70c08f8d20c0eb4fe56f26644dd94dae76a7f450", + "reference": "70c08f8d20c0eb4fe56f26644dd94dae76a7f450", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" + }, + "bin": [ + "bin/phpcbf", + "bin/phpcs" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "keywords": [ + "phpcs", + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" + }, + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-11-12T09:53:29+00:00" + }, + { + "name": "wp-coding-standards/wpcs", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/WordPress/WordPress-Coding-Standards.git", + "reference": "9333efcbff231f10dfd9c56bb7b65818b4733ca7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/9333efcbff231f10dfd9c56bb7b65818b4733ca7", + "reference": "9333efcbff231f10dfd9c56bb7b65818b4733ca7", + "shasum": "" + }, + "require": { + "ext-filter": "*", + "ext-libxml": "*", + "ext-tokenizer": "*", + "ext-xmlreader": "*", + "php": ">=5.4", + "phpcsstandards/phpcsextra": "^1.2.1", + "phpcsstandards/phpcsutils": "^1.0.10", + "squizlabs/php_codesniffer": "^3.9.0" + }, + "require-dev": { + "php-parallel-lint/php-console-highlighter": "^1.0.0", + "php-parallel-lint/php-parallel-lint": "^1.3.2", + "phpcompatibility/php-compatibility": "^9.0", + "phpcsstandards/phpcsdevtools": "^1.2.0", + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + }, + "suggest": { + "ext-iconv": "For improved results", + "ext-mbstring": "For improved results" + }, + "type": "phpcodesniffer-standard", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Contributors", + "homepage": "https://github.com/WordPress/WordPress-Coding-Standards/graphs/contributors" + } + ], + "description": "PHP_CodeSniffer rules (sniffs) to enforce WordPress coding conventions", + "keywords": [ + "phpcs", + "standards", + "static analysis", + "wordpress" + ], + "support": { + "issues": "https://github.com/WordPress/WordPress-Coding-Standards/issues", + "source": "https://github.com/WordPress/WordPress-Coding-Standards", + "wiki": "https://github.com/WordPress/WordPress-Coding-Standards/wiki" + }, + "funding": [ + { + "url": "https://opencollective.com/php_codesniffer", + "type": "custom" + } + ], + "time": "2024-03-25T16:39:00+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": {}, + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": ">=5.6.0" + }, + "platform-dev": {}, + "plugin-api-version": "2.6.0" +} diff --git a/footer.php b/footer.php index c647bb0..8b6fc88 100644 --- a/footer.php +++ b/footer.php @@ -4,8 +4,9 @@ * * Contains the closing of the #content div and all content after * - * @package Atomic Blocks + * @package lovelace */ + ?> @@ -44,11 +45,15 @@ diff --git a/functions.php b/functions.php index 70ef5f8..1bad6ba 100644 --- a/functions.php +++ b/functions.php @@ -1,21 +1,22 @@ registered['jquery'] ) ) { - $jquery_dependencies = $scripts->registered['jquery']->deps; - $scripts->registered['jquery']->deps = array_diff( $jquery_dependencies, [ 'jquery-migrate' ] ); + $jquery_dependencies = $scripts->registered['jquery']->deps; + $scripts->registered['jquery']->deps = array_diff( $jquery_dependencies, array( 'jquery-migrate' ) ); } } @@ -25,44 +26,44 @@ function lovelace_dequeue_jquery_migrate( $scripts ) { * Dequeue assets from parent theme. */ function lovelace_dequeue_assets() { - // remove custom fonts + // Remove custom fonts. wp_dequeue_style( 'atomic-blocks-fonts' ); wp_deregister_style( 'atomic-blocks-fonts' ); - // remove Font Awesome + // Remove Font Awesome. wp_dequeue_style( 'font-awesome' ); wp_deregister_style( 'font-awesome' ); wp_dequeue_style( 'atomic-blocks-fontawesome' ); wp_deregister_style( 'atomic-blocks-fontawesome' ); } -add_action ( 'wp_enqueue_scripts', 'lovelace_dequeue_assets', 100 ); +add_action( 'wp_enqueue_scripts', 'lovelace_dequeue_assets', 100 ); /** * Dequeue customizer style from parent theme we don’t actually need. */ function lovelace_dequeue_customizer_style() { - // remove customizer in-site CSS + // Remove customizer in-site CSS. wp_styles()->add_data( 'atomic-blocks-style', 'after', '' ); } -add_action ( 'wp_print_styles', 'lovelace_dequeue_customizer_style' ); +add_action( 'wp_print_styles', 'lovelace_dequeue_customizer_style' ); /** * Enqueue our custom scripts and styles. */ function lovelace_enqueue_assets() { - // check for SCRIPT_DEBUG + // Check for SCRIPT_DEBUG. $suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min' ); - - // enqueue parent theme CSS + + // Enqueue parent theme CSS. $css_file = get_template_directory() . '/style.css'; - $css_url = get_template_directory_uri() . '/style.css'; - wp_enqueue_style( 'atomic-blocks-style', $css_url, [], filemtime( $css_file ) ); - - // include Lovelace theme CSS + $css_url = get_template_directory_uri() . '/style.css'; + wp_enqueue_style( 'atomic-blocks-style', $css_url, array(), filemtime( $css_file ) ); + + // Include Lovelace theme CSS. $css_file = get_stylesheet_directory() . '/style' . $suffix . '.css'; - $css_url = get_stylesheet_directory_uri() . '/style' . $suffix . '.css'; - wp_enqueue_style( 'lovelace-style', $css_url, [], filemtime( $css_file ) ); + $css_url = get_stylesheet_directory_uri() . '/style' . $suffix . '.css'; + wp_enqueue_style( 'lovelace-style', $css_url, array(), filemtime( $css_file ) ); } add_action( 'wp_enqueue_scripts', 'lovelace_enqueue_assets' ); @@ -72,7 +73,7 @@ function lovelace_enqueue_assets() { */ function lovelace_remove_customizer_sections() { global $wp_customize; - + $wp_customize->remove_section( 'atomic_blocks_theme_options' ); $wp_customize->remove_section( 'colors' ); } diff --git a/header.php b/header.php index 0a2d828..bba73a9 100644 --- a/header.php +++ b/header.php @@ -6,6 +6,7 @@ * * @package lovelace */ + ?> class="no-js"> @@ -33,7 +34,7 @@
@@ -87,7 +92,7 @@ - +