diff --git a/composer.json b/composer.json index b1a1a17..16029b7 100755 --- a/composer.json +++ b/composer.json @@ -19,16 +19,15 @@ "dnadesign/silverstripe-elemental-virtual": "*", "dnadesign/silverstripe-elemental-userforms": "*", "dynamic/silverstripe-elemental-blocks": "*", - "vulcandigital/silverstripe-seo": "^1.0", "hestec/silverstripe-cookiebar": "^1.0", "drmartingonzo/ss-tinymce-charcount": "^1.0", "axllent/silverstripe-version-truncator": "*", "firesphere/googlemapsfield": "^1.0@dev", - "dorsetdigital/silverstripe-canonical": "^1.0", "gorriecoe/silverstripe-dataobjecthistory": "^1.2", "mak001/silverstripe-categorization": "^1.0@dev", "axllent/silverstripe-bootstrap-forms": "^2.0", - "silverstripe/redirectedurls": "dev-master" + "silverstripe/redirectedurls": "dev-master", + "vulcandigital/silverstripe-seo": "*" }, "require-dev": { "phpunit/phpunit": "^5.7" @@ -58,4 +57,4 @@ }, "prefer-stable": true, "minimum-stability": "dev" -} +} \ No newline at end of file diff --git a/site/_config/config.yml b/site/_config/config.yml index 9e26111..f0478c0 100755 --- a/site/_config/config.yml +++ b/site/_config/config.yml @@ -1,2 +1,20 @@ SilverStripe\View\SSViewer: - source_file_comments: true \ No newline at end of file + source_file_comments: true + themes: + - '$public' + - 'simple' + - '$default' + +DNADesign\Elemental\Models\BaseElement: + default_global_elements: true + +SilverStripe\Admin\LeftAndMain: + extra_requirements_javascript: + - 'colymba/gridfield-bulk-editing-tools:client/dist/js/main.js' + - 'colymba/gridfield-bulk-editing-tools:client/lang/en.js' + extra_requirements_css: + - 'colymba/gridfield-bulk-editing-tools:client/dist/styles/main.css' + +SilverStripe\Forms\HTMLEditor\TinyMCEConfig: + editor_css: + - 'site/client/css/editor.css' \ No newline at end of file