diff --git a/language/en-GB/tpl_cassiopeia.ini b/language/en-GB/tpl_cassiopeia.ini index 74d5b8d13cba6..6d2add48020c6 100644 --- a/language/en-GB/tpl_cassiopeia.ini +++ b/language/en-GB/tpl_cassiopeia.ini @@ -6,6 +6,7 @@ CASSIOPEIA="Cassiopeia Site template" TPL_CASSIOPEIA_BACKTOTOP="Back to Top" TPL_CASSIOPEIA_BACKTOTOP_LABEL="Back-to-top Link" +TPL_CASSIOPEIA_BRAND_LABEL="Brand" TPL_CASSIOPEIA_COLOR_NAME_ALTERNATIVE="Alternative" TPL_CASSIOPEIA_COLOR_NAME_LABEL="Colour Theme" TPL_CASSIOPEIA_COLOR_NAME_STANDARD="Standard" diff --git a/language/en-GB/tpl_cassiopeia.sys.ini b/language/en-GB/tpl_cassiopeia.sys.ini index c5d9b142907f4..3a768d2c4dd64 100644 --- a/language/en-GB/tpl_cassiopeia.sys.ini +++ b/language/en-GB/tpl_cassiopeia.sys.ini @@ -6,6 +6,7 @@ CASSIOPEIA="Cassiopeia Site template" TPL_CASSIOPEIA_MOD_MENU_LAYOUT_DROPDOWN-METISMENU="Dropdown" TPL_CASSIOPEIA_POSITION_BANNER="Banner" +TPL_CASSIOPEIA_POSITION_BELOW-TOP="Below Top" TPL_CASSIOPEIA_POSITION_BOTTOM-A="Bottom-a" TPL_CASSIOPEIA_POSITION_BOTTOM-B="Bottom-b" TPL_CASSIOPEIA_POSITION_BREADCRUMBS="Breadcrumbs" diff --git a/templates/cassiopeia/index.php b/templates/cassiopeia/index.php index f87f70fcacbed..285a44b4f74eb 100644 --- a/templates/cassiopeia/index.php +++ b/templates/cassiopeia/index.php @@ -125,16 +125,25 @@ -
- + + + params->get('brand')) : ?> +
+ +
+ + countModules('menu', true) || $this->countModules('search', true)) : ?>
countModules('menu', true)) : ?> diff --git a/templates/cassiopeia/scss/blocks/_layout.scss b/templates/cassiopeia/scss/blocks/_layout.scss index 0febe63a3897a..8476c273b7377 100644 --- a/templates/cassiopeia/scss/blocks/_layout.scss +++ b/templates/cassiopeia/scss/blocks/_layout.scss @@ -12,7 +12,8 @@ position: relative; } -.container-topbar { +.container-topbar, +.container-below-top { color: $white; a { color: currentColor; diff --git a/templates/cassiopeia/templateDetails.xml b/templates/cassiopeia/templateDetails.xml index 2aeeb09b0593f..26c5b9819018f 100644 --- a/templates/cassiopeia/templateDetails.xml +++ b/templates/cassiopeia/templateDetails.xml @@ -24,6 +24,7 @@ topbar + below-top menu search banner @@ -46,11 +47,24 @@
+ + + + + @@ -91,6 +108,7 @@ label="TPL_CASSIOPEIA_FONT_NOTE_TEXT" heading="p" class="alert alert-warning" + parentclass="span-3-inline" />