diff --git a/app/_config/elements.yml b/app/_config/elements.yml index f73fc1b..998b7c1 100644 --- a/app/_config/elements.yml +++ b/app/_config/elements.yml @@ -44,10 +44,7 @@ SilverStripe\CMS\Model\SiteTree: - Site\Elements\MapElement #- Site\Elements\AccordionElement - DNADesign\ElementalVirtual\Model\ElementVirtual - - Site\Elements\ColorBarElement - Site\Elements\AccordionElement - - Site\Elements\VideoElement - - Site\Elements\GalleryElement - Site\Elements\CustomSnippetElement DNADesign\ElementalList\Model\ElementList: @@ -65,7 +62,6 @@ DNADesign\ElementalList\Model\ElementList: - Site\Elements\SliderElement - Site\Elements\BlockElement - Site\Elements\MapElement - - Site\Elements\ColorBarElement - Site\Elements\AccordionElement styles: whiteframe: 'White Frame' diff --git a/app/_config/logs.yml b/app/_config/logs.yml new file mode 100644 index 0000000..bcb6d95 --- /dev/null +++ b/app/_config/logs.yml @@ -0,0 +1,60 @@ +--- +Name: webapp-dev-errors +Only: + environment: dev +--- +SilverStripe\Core\Injector\Injector: + Psr\Log\LoggerInterface.errorhandler: + calls: + pushMyDisplayErrorHandler: [pushHandler, ['%$DisplayErrorHandler']] + DisplayErrorHandler: + class: SilverStripe\Logging\HTTPOutputHandler + constructor: + - 'notice' + properties: + Formatter: '%$SilverStripe\Logging\DetailedErrorFormatter' + CLIFormatter: '%$SilverStripe\Logging\DetailedErrorFormatter' +--- +Name: webapp-live-errors +Except: + environment: dev +--- +SilverStripe\Core\Injector\Injector: + # Default logger implementation for general purpose use + Psr\Log\LoggerInterface: + calls: + # Save system logs to file + pushFileLogHandler: [pushHandler, ['%$LogFileHandler']] + + # Core error handler for system use + Psr\Log\LoggerInterface.errorhandler: + calls: + # Save errors to file + pushFileLogHandler: [pushHandler, ['%$LogFileHandler']] + # Format and display errors in the browser/CLI + pushMyDisplayErrorHandler: [pushHandler, ['%$DisplayErrorHandler']] + + # Custom handler to log to a file + LogFileHandler: + class: Monolog\Handler\StreamHandler + constructor: + - '../silverstripe.log' + - 'notice' + properties: + Formatter: '%$Monolog\Formatter\HtmlFormatter' + ContentType: text/html + + # Handler for displaying errors in the browser or CLI + DisplayErrorHandler: + class: SilverStripe\Logging\HTTPOutputHandler + constructor: + - 'error' + properties: + Formatter: '%$SilverStripe\Logging\DebugViewFriendlyErrorFormatter' + + # Configuration for the "friendly" error formatter + SilverStripe\Logging\DebugViewFriendlyErrorFormatter: + class: SilverStripe\Logging\DebugViewFriendlyErrorFormatter + properties: + Title: 'There has been an error' + Body: 'The website server has not been able to respond to your request' diff --git a/app/client/src/scss/_elements.scss b/app/client/src/scss/_elements.scss index 4aefc04..284c4e2 100644 --- a/app/client/src/scss/_elements.scss +++ b/app/client/src/scss/_elements.scss @@ -1 +1,29 @@ /* style elements here */ + +.element { + background-size: cover; + background-repeat: no-repeat; + + &.site__elements__sliderelement { + .element-container { + width: 100%; + padding: 0; + max-width: none; + } + } + + &.dynamic__elements__image__elements__elementimage { + text-align: center; + } + + &.site__elements__accordion { + .card { + padding-left: 0; + padding-right: 0; + + .card-header { + @extend .bg-dark; + } + } + } +} diff --git a/app/client/src/scss/_layout.scss b/app/client/src/scss/_layout.scss index e318e7b..696fc20 100644 --- a/app/client/src/scss/_layout.scss +++ b/app/client/src/scss/_layout.scss @@ -78,35 +78,6 @@ body.shrink { } } -// site blocks (elements) -.element { - background-size: cover; - background-repeat: no-repeat; - - &.site__elements__sliderelement { - .element-container { - width: 100%; - padding: 0; - max-width: none; - } - } - - &.dynamic__elements__image__elements__elementimage { - text-align: center; - } - - &.site__elements__accordion { - .card { - padding-left: 0; - padding-right: 0; - - .card-header { - @extend .bg-dark; - } - } - } -} - .sidebar__col { position: relative; margin-bottom: $grid-gutter-element-height * 2;