diff --git a/app/_config/app.yml b/app/_config/app.yml index 6617f80..a2b671d 100644 --- a/app/_config/app.yml +++ b/app/_config/app.yml @@ -19,3 +19,6 @@ DNADesign\ElementalList\Model\ElementList: DNADesign\ElementalUserForms\Model\ElementForm: block_default_userforms_css: true block_default_userforms_js: true + +SilverLeague\IDEAnnotator\DataObjectAnnotator: + enabled: true diff --git a/app/client/src/scss/layout/header.scss b/app/client/src/scss/layout/header.scss index 9af3aca..dae8f1c 100644 --- a/app/client/src/scss/layout/header.scss +++ b/app/client/src/scss/layout/header.scss @@ -12,26 +12,13 @@ } #Header { + .element { + margin-top: 0; + } .nav-container { align-items: center; display: flex; justify-content: flex-end; position: static; } - - .logo { - img { - width: 6.5vw; - - @media (orientation: portrait) { - width: 20vw; - } - } - } - - .tagline { - display: inline-block; - font-size: 1.2rem; - margin-left: 2em; - } } diff --git a/app/src/Pages/Controllers/HomePageController.php b/app/src/Pages/Controllers/HomePageController.php index 3e6ac0b..c3e5a18 100644 --- a/app/src/Pages/Controllers/HomePageController.php +++ b/app/src/Pages/Controllers/HomePageController.php @@ -4,6 +4,10 @@ namespace App\Pages\Controllers; use PageController; +/** + * Class \App\Pages\Controllers\HomePageController + * + */ class HomePageController extends PageController { } diff --git a/app/src/Pages/HomePage.php b/app/src/Pages/HomePage.php index 0357241..68d14a4 100644 --- a/app/src/Pages/HomePage.php +++ b/app/src/Pages/HomePage.php @@ -5,6 +5,10 @@ namespace App\Pages; use App\Pages\Controllers\HomePageController; use Page; +/** + * Class \App\Pages\HomePage + * + */ class HomePage extends Page { private static $icon_class = 'font-icon-p-home'; diff --git a/app/src/Pages/Page.php b/app/src/Pages/Page.php index e75783c..2193f33 100644 --- a/app/src/Pages/Page.php +++ b/app/src/Pages/Page.php @@ -9,6 +9,19 @@ use SilverStripe\CMS\Model\SiteTree; use SilverStripe\FontAwesome\FontAwesomeField; use TractorCow\Fluent\Extension\FluentSiteTreeExtension; +/** + * Class \Page + * + * @property boolean $InheritSideBar + * @property string $BlockIcon + * @property int $SideBarID + * @property int $ElementalAreaID + * @method \SilverStripe\Widgets\Model\WidgetArea SideBar() + * @method \DNADesign\Elemental\Models\ElementalArea ElementalArea() + * @mixin \DNADesign\Elemental\Extensions\ElementalPageExtension + * @mixin \A2nt\CMSNiceties\Widgets\WidgetPageExtension + * @mixin \Sheadawson\Linkable\Extensions\LinkableDataExtension + */ class Page extends SiteTree { protected $_cached = []; diff --git a/app/src/Pages/PageController.php b/app/src/Pages/PageController.php index a4a8dfe..5e564ba 100644 --- a/app/src/Pages/PageController.php +++ b/app/src/Pages/PageController.php @@ -25,6 +25,13 @@ use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\PaginatedList; use SilverStripe\View\ArrayData; +/** + * Class \PageController + * + * @property \Page dataRecord + * @method \Page data() + * @mixin \Page + */ class PageController extends ContentController { private static $allowed_actions = [ diff --git a/composer.json b/composer.json index 2159965..50e7b4b 100755 --- a/composer.json +++ b/composer.json @@ -52,7 +52,8 @@ "require-dev": { "phpunit/phpunit": "*", "lekoala/silverstripe-debugbar": "dev-master", - "sunnysideup/easy-coding-standards": "dev-master" + "sunnysideup/easy-coding-standards": "dev-master", + "silverleague/ideannotator": "dev-master" }, "repositories": [ {