diff --git a/app/client/src/js/_components/_ui.shrink.js b/app/client/src/js/_components/_ui.shrink.js new file mode 100644 index 0000000..6cd2197 --- /dev/null +++ b/app/client/src/js/_components/_ui.shrink.js @@ -0,0 +1,22 @@ +"use strict"; + +import $ from 'jquery'; + +const ShrinkUI = (($) => { + // Constants + const G = window; + const D = document; + + // shrink bar + $(G).scroll(function() { + if ($(D).scrollTop() > 100) { + $('body').addClass('shrink'); + } else { + $('body').removeClass('shrink'); + } + }); + + return ShrinkUI; +})($); + +export default ShrinkUI; diff --git a/app/client/src/js/_main.js b/app/client/src/js/_main.js index b89e3f4..5dc5eed 100644 --- a/app/client/src/js/_main.js +++ b/app/client/src/js/_main.js @@ -12,6 +12,7 @@ import './_components/routes/index'; import Events from './_events'; import Spinner from './_components/_ui.spinner'; +import './_components/_ui.shrink'; import './_components/_ui.carousel'; import './_components/_ui.menu'; import './_components/_ui.form.storage'; diff --git a/app/client/src/scss/_layout.scss b/app/client/src/scss/_layout.scss index 9722f34..9d2b66b 100644 --- a/app/client/src/scss/_layout.scss +++ b/app/client/src/scss/_layout.scss @@ -1,3 +1,29 @@ /** * Your custom style */ + +// shrink elements on scroll +body.shrink {} + +// sticky footer +html, body { + height: 100%; + min-height: 100%; +} + +.wrapper { + min-height: 100%; + padding-top: 7.4rem; + padding-bottom: 2rem; +} + +.site-footer { + height: 2rem; + margin-top: -2rem; + line-height: 2rem; +} + +// element col paddings +.col-block { + padding: $grid-gutter-height / 4; +} diff --git a/app/src/Extensions/BlogPostExtension.php b/app/src/Extensions/BlogPostExtension.php index 79a1d8b..fdd9215 100644 --- a/app/src/Extensions/BlogPostExtension.php +++ b/app/src/Extensions/BlogPostExtension.php @@ -8,7 +8,6 @@ namespace Site\Extensions; -use DNADesign\Elemental\Models\BaseElement; use DNADesign\Elemental\Models\ElementContent; use SilverStripe\ORM\DataExtension; @@ -21,20 +20,19 @@ class BlogPostExtension extends DataExtension public function Summary($wordsToDisplay = 30) { $summary = $this->owner->getField('Summary'); - if($summary){ + if ($summary) { return $summary; } - BaseElement:: $element = ElementContent::get()->filter([ 'ParentID' => $this->owner->ElementalArea()->ID, 'HTML:not' => [null], ])->first(); - if($element){ + if ($element) { return $element->dbObject('HTML')->Summary($wordsToDisplay); } return false; } -} \ No newline at end of file +} diff --git a/app/src/Extensions/ElementRows.php b/app/src/Extensions/ElementRows.php index 056f156..a7365a7 100644 --- a/app/src/Extensions/ElementRows.php +++ b/app/src/Extensions/ElementRows.php @@ -17,7 +17,7 @@ use SilverStripe\Forms\FieldList; class ElementRows extends DataExtension { private static $container_max_width = 1140; - private static $column_class = 'col-md-'; + private static $column_class = 'col-block col-md-'; private static $container_styles = [ 'container' => 'Fixed container', diff --git a/app/templates/Site/Elements/SliderElement.ss b/app/templates/Site/Elements/SliderElement.ss index 580cc22..fa1257b 100644 --- a/app/templates/Site/Elements/SliderElement.ss +++ b/app/templates/Site/Elements/SliderElement.ss @@ -1,5 +1,9 @@ +<% if $ShowTitle %> +

$Title

+<% end_if %> + <% if $SlideShow %> -