diff --git a/app/_config/templates-requirements.yml b/app/_config/templates-requirements.yml index 1a9eae1..3fc7763 100644 --- a/app/_config/templates-requirements.yml +++ b/app/_config/templates-requirements.yml @@ -13,7 +13,7 @@ A2nt\CMSNiceties\Templates\DeferredRequirements: jquery_version: '3.4.1' SilverStripe\FontAwesome\FontAwesomeField: - version: '5.12.0' + version: '5.15.4' SilverStripe\View\Requirements: disable_flush_combined: true diff --git a/app/_config/webpack.yml b/app/_config/webpack.yml index f8b5f11..43adf02 100644 --- a/app/_config/webpack.yml +++ b/app/_config/webpack.yml @@ -19,5 +19,6 @@ A2nt\CMSNiceties\Templates\WebpackTemplateProvider: GRAPHQL_URL: '/graphql' GRAPHQL_API_KEY: 'LgPaRkVPYa8IY7x3AjbLC8wx6oPPSlO01yPflFXecvQ' PROCESS_CSS: true # Deep CSS minification + absolute_path: false JQUERY: false # We don't use jQuery, otherwise it's aliassed and being loaded externaly #STATIC_URL: 'http://127.0.0.1' diff --git a/app/client/src/scss/variables/ui.scss b/app/client/src/scss/variables/ui.scss index 762c73a..33f6a63 100644 --- a/app/client/src/scss/variables/ui.scss +++ b/app/client/src/scss/variables/ui.scss @@ -7,6 +7,8 @@ $font-family-base: "Roboto", $font-family-sans-serif; $body-bg: $white; $body-color: $gray-500; +$sidebar-nav-link-hover-color: $body-color; + // screen size - 32px (ex. 1400 - 32 = 1368) $grid-breakpoints: ( xs: 0, diff --git a/composer.json b/composer.json index a7187ac..ce0013e 100755 --- a/composer.json +++ b/composer.json @@ -69,6 +69,10 @@ { "type": "vcs", "url": "https://github.com/a2nt/silverstripe-image-cropper-field" + }, + { + "type": "vcs", + "url": "https://github.com/a2nt/GridFieldBulkEditingTools" } ], "extra": { diff --git a/phpcs.xml b/phpcs.xml new file mode 100644 index 0000000..c9dfc72 --- /dev/null +++ b/phpcs.xml @@ -0,0 +1,154 @@ + + + The coding standard for PHP_CodeSniffer itself. + + autoload.php + bin + scripts + src + tests + + */src/Standards/*/Tests/*\.(inc|css|js)$ + */tests/Core/*/*\.(inc|css|js)$ + + + + + + + + + error + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + error + + + + + error + + + + + tests/bootstrap\.php + + + + + tests/Core/Tokenizer/StableCommentWhitespaceWinTest\.php + + +