Skip to content

Commit

Permalink
Merge pull request #31520 from richard67/4.0-dev-cassiopeia-development
Browse files Browse the repository at this point in the history
[4.0] Cassopeia template and blog sample data fixes and improvements
  • Loading branch information
wilsonge authored Dec 1, 2020
2 parents 8487a6c + 21b36c9 commit 965652a
Show file tree
Hide file tree
Showing 74 changed files with 3,103 additions and 1,134 deletions.
52 changes: 42 additions & 10 deletions administrator/language/en-GB/plg_sampledata_blog.ini

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions build/build-modules-js/compilecss.es6.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ module.exports.compile = (options, path) => {
`${RootPath}/templates/cassiopeia/scss/offline.scss`,
`${RootPath}/templates/cassiopeia/scss/template.scss`,
`${RootPath}/templates/cassiopeia/scss/template-rtl.scss`,
`${RootPath}/templates/cassiopeia/scss/global/fonts-local_roboto.scss`,
`${RootPath}/templates/cassiopeia/scss/global/fonts-web_fira-sans.scss`,
`${RootPath}/templates/cassiopeia/scss/global/fonts-web_roboto+noto-sans.scss`,
`${RootPath}/templates/cassiopeia/scss/global/colors_standard.scss`,
`${RootPath}/templates/cassiopeia/scss/global/colors_alternative.scss`,
`${RootPath}/templates/cassiopeia/scss/system/searchtools/searchtools.scss`,
`${RootPath}/templates/cassiopeia/scss/vendor/choicesjs/choices.scss`,
`${RootPath}/templates/cassiopeia/scss/vendor/joomla-custom-elements/joomla-alert.scss`,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/**
* @package Joomla.Site
* @subpackage Templates.cassiopeia
* @copyright (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @since 4.0
*/

document.addEventListener('DOMContentLoaded', () => {
const allMenus = document.querySelectorAll('ul.mod-menu_dropdown-metismenu');

allMenus.forEach((menu) => {
// eslint-disable-next-line no-new, no-undef
const mm = new MetisMenu(menu, {
triggerElement: 'button.mm-toggler',
}).on('shown.metisMenu', (event) => {
window.addEventListener('click', function mmClick(e) {
if (!event.target.contains(e.target)) {
mm.hide(event.detail.shownElement);
window.removeEventListener('click', mmClick);
}
});
});
});
});
Binary file added images/sampledata/cassiopeia/nasa1-1200.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sampledata/cassiopeia/nasa1-400.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sampledata/cassiopeia/nasa1-640.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sampledata/cassiopeia/nasa2-1200.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sampledata/cassiopeia/nasa2-400.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sampledata/cassiopeia/nasa2-640.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sampledata/cassiopeia/nasa3-1200.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sampledata/cassiopeia/nasa3-400.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sampledata/cassiopeia/nasa3-640.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sampledata/cassiopeia/nasa4-1200.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sampledata/cassiopeia/nasa4-400.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/sampledata/cassiopeia/nasa5-400.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions language/en-GB/tpl_cassiopeia.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,19 @@
CASSIOPEIA="Cassiopeia Site template"
TPL_CASSIOPEIA_BACKTOTOP="Back to Top"
TPL_CASSIOPEIA_BACKTOTOP_LABEL="Back-to-top Link"
TPL_CASSIOPEIA_COLOR_NAME_ALTERNATIVE="Alternative"
TPL_CASSIOPEIA_COLOR_NAME_LABEL="Colour Theme"
TPL_CASSIOPEIA_COLOR_NAME_STANDARD="Standard"
TPL_CASSIOPEIA_FLUID="Fluid"
TPL_CASSIOPEIA_FLUID_LABEL="Layout"
TPL_CASSIOPEIA_FONT_GROUP_LOCAL="Fonts from Folder"
TPL_CASSIOPEIA_FONT_GROUP_WEB="Fonts from Web"
TPL_CASSIOPEIA_FONT_LABEL="Fonts Scheme"
TPL_CASSIOPEIA_FONT_NOTE_TEXT="Loading fonts from external sources might be against privacy regulations in some countries.<br>Loading fonts from a local folder might have a performance impact on your site."
TPL_CASSIOPEIA_LOGO_LABEL="Logo"
TPL_CASSIOPEIA_STATIC="Static"
TPL_CASSIOPEIA_STICKY_LABEL="Sticky Header"
TPL_CASSIOPEIA_TAGLINE="Tagline"
TPL_CASSIOPEIA_TITLE="Title (alternative to logo)"
TPL_CASSIOPEIA_TOGGLE="Toggle Navigation"
TPL_CASSIOPEIA_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0, Milkyway from 1.5 and Protostar from 3.0), Cassiopeia is the Joomla 4 site template based on Bootstrap 4."
1 change: 1 addition & 0 deletions language/en-GB/tpl_cassiopeia.sys.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
; Note : All ini files need to be saved as UTF-8

CASSIOPEIA="Cassiopeia Site template"
TPL_CASSIOPEIA_MOD_MENU_LAYOUT_DROPDOWN-METISMENU="Dropdown"
TPL_CASSIOPEIA_POSITION_BANNER="Banner"
TPL_CASSIOPEIA_POSITION_BOTTOM-A="Bottom-a"
TPL_CASSIOPEIA_POSITION_BOTTOM-B="Bottom-b"
Expand Down
Loading

0 comments on commit 965652a

Please sign in to comment.