Skip to content

[5.3] Upmerge changes from 5.2-dev 2024-10-29 #44367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richard67 merged 10 commits into from
Oct 29, 2024
Merged

[5.3] Upmerge changes from 5.2-dev 2024-10-29 #44367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3b358b8
[cypress] Database Unix Sockets for System Tests (#44092)
muhme Oct 24, 2024
9f3bec7
Add null check for search filter (#44349)
QuyTon Oct 25, 2024
3e22969
[5.2] Fixed a set of options for the demo data plugin (#44166)
Kostelano Oct 26, 2024
30984e7
[5.2] Fix Dart Sass deprecations (#44129)
C-Lodder Oct 26, 2024
2d4547e
Only add margin to system message container if it contains a joomla-a…
coolcat-creations Oct 26, 2024
66344af
Remove trailing slashes (#44340)
bembelimen Oct 29, 2024
cb29c13
Merge branch '5.2-dev' into 5.3-dev-upmerge-2024-10-29
richard67 Oct 29, 2024
324ad16
Fix javascript-cs failing in Drone
richard67 Oct 29, 2024
7db556c
Fix multi-line comment indentation (#44368)
richard67 Oct 29, 2024
b18ed6b
Merge branch '5.2-dev' into 5.3-dev-upmerge-2024-10-29
richard67 Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion administrator/components/com_cache/src/View/Cache/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public function display($tpl = null): void
throw new GenericDataException(implode("\n", $errors), 500);
}

if (!\count($this->data) && $this->state->get('filter.search') === '') {
if (!\count($this->data) && ($this->state->get('filter.search') === null || $this->state->get('filter.search') === '')) {
$this->setLayout('emptystate');
}

Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/plg_sampledata_blog.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_INTROTEXT="<p>Your home page is
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_TITLE="About your home page"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_FULLTEXT=""
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_FULLTEXTIMAGE_ALT="Crab Nebula"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_INTROTEXT="<p>Your site has some commonly used modules already preconfigured. These include:</p><ul><li>Image (type: Custom), which holds the image beneath the menu. This is a Custom module that you can edit to change the image.</li><li>Popular Tags (type: Tags - Popular), which will appear if you use tagging on your articles. Enter a tag in the Tags field when editing.</li><li>Older Posts (type: Articles - Category), which lists out articles by categories.</li><li>Syndication (type: Syndication Feeds), which allows your readers to read your posts in a news reader.</li><li>Login Form (type: Login), which allows your users to access restricted areas of the website.</li></ul><p>Each of these modules has many options which you can experiment with in the Module Manager in your site Administrator. When you are logged in you can also select the edit icon in the top right corner which will take you to an edit screen for that module. Always be sure to save and close any module you edit.</p><p>Joomla! also includes many other modules you can incorporate in your site. As you develop your site you may want to add more modules that you can find at the <a href=\"https://extensions.joomla.org/\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla Extensions Directory.</a></p>"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_INTROTEXT="<p>Your site has some commonly used modules already preconfigured. These include:</p><ul><li>Image (type: Custom), which holds the image beneath the menu. This is a Custom module that you can edit to change the image.</li><li>Popular Tags (type: Tags - Popular), which will appear if you use tagging on your articles. Enter a tag in the Tags field when editing.</li><li>Older Posts (type: Articles), which lists out articles by categories.</li><li>Syndication (type: Syndication Feeds), which allows your readers to read your posts in a news reader.</li><li>Login Form (type: Login), which allows your users to access restricted areas of the website.</li></ul><p>Each of these modules has many options which you can experiment with in the Module Manager in your site Administrator. When you are logged in you can also select the edit icon in the top right corner which will take you to an edit screen for that module. Always be sure to save and close any module you edit.</p><p>Joomla! also includes many other modules you can incorporate in your site. As you develop your site you may want to add more modules that you can find at the <a href=\"https://extensions.joomla.org/\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla Extensions Directory.</a></p>"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_TITLE="Your Modules"
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_FULLTEXT=""
PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_INTROTEXT="<p>Templates control the look and feel of your website.</p><p>This blog is installed with the Cassiopeia template.</p><p>You can edit the options by selecting the Working on Your Site, Template Settings link in the menu which is visible when you log in.</p><p>For example you can change the site background colour, highlights colour, site title, site description and title font used.</p><p>More options are available in the site administrator. You may also install a new template using the extension manager.</p>"
Expand Down
97 changes: 49 additions & 48 deletions build/media_source/templates/administrator/atum/scss/_variables-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:color";

// Color definitions for the dark theme - don't use it with the light theme
$btn-primary-dark: #007db0; // contrast ratio: 4.6 with #fff text
Expand Down Expand Up @@ -33,53 +34,53 @@ $atum-colors-dark: (
media-manager-content-bg: var(--body-bg),
media-manager-overlay-bg: var(--template-bg-dark-90), // fix this
media-manager-infobar-dt-color: rgba(255, 255, 255, .54),
media-manager-content-color: lighten($btn-primary-dark, 20%),
media-manager-content-color: color.adjust($btn-primary-dark, $lightness: 20%),
media-manager-overlay-header-bg: var(--template-bg-dark-80),
media-manager-disk-name-color: var(--template-text-light),
media-manager-border: 1px solid var(--gray-800),
media-manager-file-icon-color: $btn-primary-dark,
media-manager-tree-item-hover-bg: var(--gray-600),
media-manager-toolbar-icon-color: lighten($btn-primary-dark, 20%),
media-manager-toolbar-icon-color: color.adjust($btn-primary-dark, $lightness: 20%),
media-manager-breadcrumb-item-bg: var(--gray-700),

media-tree-item-color: $btn-primary-dark,
media-tree-active-icon-color: darken($btn-primary-dark, 10%),
media-tree-active-icon-color: color.adjust($btn-primary-dark, $lightness: -10%),

media-browser-file-bg: var(--media-manager-bg),
media-drive-bg: var(--media-manager-bg),

media-toolbar-bg: var(--media-manager-bg),
media-toolbar-icon-bg: var(--media-manager-bg),
media-toolbar-icon-color: lighten($btn-primary-dark, 10%),
media-toolbar-icon-color: color.adjust($btn-primary-dark, $lightness: 10%),
media-toolbar-icon-bg-hvr: var(--gray-800),

image-bg: #000,
image-bg-image: (linear-gradient(45deg, var(--body-bg) 25%, transparent 25%, transparent 75%, #111 75%, var(--body-bg) 100%), linear-gradient(45deg, #111 25%, transparent 25%, transparent 75%, var(--body-bg) 75%, var(--body-bg) 100%)),

success-text: #418d52,
success: $success-dark,
successhvr: darken($success-dark, 15%),
successhvr: color.adjust($success-dark, $lightness: -15%),

danger-text: #e0615c,
danger: $danger-dark,
dangerhvr: darken($danger-dark, 15%),
dangerhvr: color.adjust($danger-dark, $lightness: -15%),

darkdanger: #941f1c,
darkdangerhvr: darken(#941f1c, 15%),
darkdangerhvr: color.adjust(#941f1c, $lightness: -15%),

error: #941f1c,
errorhvr: #be2824,

warning-text: #000,
warning: #f0ad4e,
warninghvr: darken($warning, 15%),
warninghvr: color.adjust($warning, $lightness: -15%),

dark-mode-text-light: rgba(255,255,255,.85),

template-link-color: $link-color-dark,
link-color-rgb: (36,158,200),
link-color: $link-color-dark,
template-link-hover-color: lighten($link-color-dark, 10%),
template-link-hover-color: color.adjust($link-color-dark, $lightness: 10%),
link-color-rgb-hvr: var(--template-link-hover-color),

template-quickicon-bg: rgba(255, 255, 255, .1),
Expand Down Expand Up @@ -110,7 +111,7 @@ $atum-colors-dark: (
form-select-option: var(--template-text-light),
form-select-option-disabled-bg: var(--template-bg-dark-90),
file-selector-btn-bg: $btn-primary-dark,
file-selector-btn-bg-hvr: darken($btn-primary-dark, 10%),
file-selector-btn-bg-hvr: color.adjust($btn-primary-dark, $lightness: -10%),

// Background styles
bg-normal: var(--template-bg-dark),
Expand Down Expand Up @@ -158,7 +159,7 @@ $atum-colors-dark: (
main-nav-divider-bg: #495057,
main-nav-item-title: var(--template-bg-dark-30),
main-nav-mm-active-bg: $btn-primary-dark,
main-nav-mm-active-quicktask-bg: darken($btn-primary-dark, 10%),
main-nav-mm-active-quicktask-bg: color.adjust($btn-primary-dark, $lightness: -10%),
main-nav-badge: var(--template-bg-dark-60),
main-nav-item-title-hvr-bg: $btn-primary-dark,
mobile-menu-collapse-bg: var(--template-bg-dark-50),
Expand All @@ -169,7 +170,7 @@ $atum-colors-dark: (
// Header content
header-bg: #0a0e13,
header-item-content-bg: $btn-primary-dark,
header-item-content-bg-hvr: darken($btn-primary-dark, 10%),
header-item-content-bg-hvr: color.adjust($btn-primary-dark, $lightness: -10%),
header-item-content-border-radius: 22px,
header-item-content-jversion-color: var(--dark-mode-text-light),
header-item-content-jversion-bg: transparent,
Expand Down Expand Up @@ -224,7 +225,7 @@ $atum-colors-dark: (
joomla-tab-btn-region-border: var(--atum-btn-bg),

joomla-tablist-btn-aria-exp: var(--template-text-light),
joomla-tablist-btn-aria-exp-bg: darken($btn-primary-dark, 10%),
joomla-tablist-btn-aria-exp-bg: color.adjust($btn-primary-dark, $lightness: -10%),
joomla-tablist-btn-aria-exp-aft-bg: $btn-primary-dark,
joomla-tablist-border-bottom: 1px solid var(--gray-800),

Expand Down Expand Up @@ -273,17 +274,17 @@ $atum-colors-dark: (
btn-primary-color: var(--text-normal),
btn-primary-bg: $btn-primary-dark,
primary: $btn-primary-dark,
btn-primary-border: 1px solid lighten($btn-primary-dark, 10%),
btn-primary-bg-hvr: darken($btn-primary-dark, 10%),
btn-primary-border-hvr: 1px solid lighten($btn-primary-dark, 10%),
btn-primary-border: 1px solid color.adjust($btn-primary-dark, $lightness: 10%),
btn-primary-bg-hvr: color.adjust($btn-primary-dark, $lightness: -10%),
btn-primary-border-hvr: 1px solid color.adjust($btn-primary-dark, $lightness: 10%),
btn-primary-toggle-bg: var(--template-bg-dark),
btn-primary-toggle-border: var(--template-bg-dark),

btn-secondary-color: var(--template-text-light),
btn-secondary-bg: $info-dark,
btn-secondary-border: 1px solid lighten($info-dark, 10%),
btn-secondary-bg-hvr: darken($info-dark, 10%),
btn-secondary-border-hvr: 1px solid lighten($info-dark, 10%),
btn-secondary-border: 1px solid color.adjust($info-dark, $lightness: 10%),
btn-secondary-bg-hvr: color.adjust($info-dark, $lightness: -10%),
btn-secondary-border-hvr: 1px solid color.adjust($info-dark, $lightness: 10%),

btn-dark-border: 1px solid rgba(0,0,0,.85),
btn-dark-bg: rgba(0,0,0,.9),
Expand All @@ -292,25 +293,25 @@ $atum-colors-dark: (
btn-dark-color-hvr: #fff,

btn-light-bg: $btn-primary-dark,
btn-light-border: 1px solid lighten($btn-primary-dark, 10%),
btn-light-border: 1px solid color.adjust($btn-primary-dark, $lightness: 10%),
btn-light-bg-hvr: $btn-primary-bg-hvr,


btn-outline-secondary-color: var(--template-text-light),
btn-outline-secondary-bg: #64676c,
btn-outline-secondary-border: 1px solid lighten(#64676c, 10%),
btn-outline-secondary-border: 1px solid color.adjust(#64676c, $lightness: 10%),

btn-info-color: var(--template-text-light),
btn-info-bg: $info-dark,
btn-info-border: 1px solid lighten($info-dark, 10%),
btn-info-bg-hvr: darken($info-dark, 10%),
btn-info-border-hvr: 1px solid darken($info-dark, 10%),
btn-info-border: 1px solid color.adjust($info-dark, $lightness: 10%),
btn-info-bg-hvr: color.adjust($info-dark, $lightness: -10%),
btn-info-border-hvr: 1px solid color.adjust($info-dark, $lightness: -10%),

// Dropdown
dropdown-header-bg: darken($btn-primary-dark, 10%),
dropdown-header-bg: color.adjust($btn-primary-dark, $lightness: -10%),
dropdown-divider-bg: 1px solid #fff,
dropdown-item-bg: $btn-primary-dark,
dropdown-item-bg-hvr: darken($btn-primary-dark, 10%),
dropdown-item-bg-hvr: color.adjust($btn-primary-dark, $lightness: -10%),
dropdown-item-border-bottom: 1px solid rgba(255, 255, 255, .1),
atum-dropdown-link-hover-bg: var(--gray-700),

Expand All @@ -335,7 +336,7 @@ $atum-colors-dark: (
state-success-text: var(--text-normal),
state-success-text-hvr: var(--text-normal),
state-success-bg: $success-dark,
state-success-bg-hvr: darken($success-dark, 15%),
state-success-bg-hvr: color.adjust($success-dark, $lightness: -15%),
state-success-border: var(--state-success-bg),
state-success-btn-border: var(--state-success-bg),
state-success-icon: var(--text-normal),
Expand All @@ -344,24 +345,24 @@ $atum-colors-dark: (

state-info-text: var(--text-normal),
state-info-text-hvr: var(--text-normal),
state-info-bg: darken($btn-primary-dark, 15%),
state-info-bg-hvr: darken($btn-primary-dark, 25%),
state-info-bg: color.adjust($btn-primary-dark, $lightness: -15%),
state-info-bg-hvr: color.adjust($btn-primary-dark, $lightness: -25%),
state-info-border: transparent,
state-info-icon: var(--state-info-text),
state-info-heading-bg: darken($btn-primary-dark, 5%),
state-info-heading-bg: color.adjust($btn-primary-dark, $lightness: -5%),

state-warning-text: #000,
state-warning-text-hvr: #000,
state-warning-bg: $warning,
state-warning-bg-hvr: darken($warning, 15%),
state-warning-border: darken($warning, 15%),
state-warning-bg-hvr: color.adjust($warning, $lightness: -15%),
state-warning-border: color.adjust($warning, $lightness: -15%),
state-warning-icon: #000,
state-warning-heading-bg: darken($warning, 15%),
state-warning-heading-bg: color.adjust($warning, $lightness: -15%),

state-danger-text: var(--text-normal),
state-danger-text-hvr: var(--text-normal),
state-danger-bg: $danger-dark,
state-danger-bg-hvr: darken($danger-dark, 15%),
state-danger-bg-hvr: color.adjust($danger-dark, $lightness: -15%),
state-danger-border: var(--dangerhvr),
state-danger-icon: var(--text-normal),
state-danger-heading-bg: var(--dangerhvr),
Expand All @@ -386,51 +387,51 @@ $atum-colors-dark: (
atum-btn-icon: var(--template-text-light),
atum-btn-icon-hvr: $atum-text-dark,
atum-btn-bg: $btn-primary-dark,
atum-btn-bg-hvr: darken($btn-primary-dark, 15%),
atum-btn-bg-hvr: color.adjust($btn-primary-dark, $lightness: -15%),
atum-btn-border: 1px solid hsl(var(--hue),20%,80%),
atum-btn-hvr: var(--template-text-light),

atum-btn-success: var(--atum-btn-success-hvr),
atum-btn-success-icon: var(--template-text-light),
atum-btn-success-icon-hvr: var(--atum-btn-success-hvr),
atum-btn-success-bg: $success-dark,
atum-btn-success-bg-hvr: darken($success-dark, 15%),
atum-btn-success-border: 1px solid lighten($success-dark, 10%),
atum-btn-success-bg-hvr: color.adjust($success-dark, $lightness: -15%),
atum-btn-success-border: 1px solid color.adjust($success-dark, $lightness: 10%),
atum-btn-success-hvr: var(--template-text-light),

atum-btn-danger: var(--dangerhvr),
atum-btn-danger-color: var(--template-text-light),
atum-btn-danger-icon: var(--template-text-light),
atum-btn-danger-icon-hvr: var(--atum-btn-danger-hvr),
atum-btn-danger-bg: $danger,
atum-btn-danger-bg-hvr: darken($danger, 15%),
atum-btn-danger-border: 1px solid lighten($danger, 10%),
atum-btn-danger-bg-hvr: color.adjust($danger, $lightness: -15%),
atum-btn-danger-border: 1px solid color.adjust($danger, $lightness: 10%),
atum-btn-danger-hvr: var(--template-text-light),

atum-btn-info: lighten($info-dark, 50%),
atum-btn-info: color.adjust($info-dark, $lightness: 50%),
atum-btn-info-icon: var(--template-text-light),
atum-btn-info-icon-hvr: var(--template-text-dark),
atum-btn-info-bg: $info-dark,
atum-btn-info-bg-hvr: darken($info-dark, 15%),
atum-btn-info-border: 1px solid lighten($info-dark, 10%),
atum-btn-info-bg-hvr: color.adjust($info-dark, $lightness: -15%),
atum-btn-info-border: 1px solid color.adjust($info-dark, $lightness: 10%),
atum-btn-info-hvr: var(--template-text-dark),

atum-btn-primary: lighten($btn-primary-dark, 25%),
atum-btn-primary: color.adjust($btn-primary-dark, $lightness: 25%),
atum-btn-primary-icon: var(--template-text-light),
atum-btn-primary-icon-hvr: var(--template-text-dark),
atum-btn-primary-bg: $btn-primary-dark, // var(--template-bg-dark),
atum-btn-primary-bg-hvr: darken($btn-primary-dark, 15%),
atum-btn-primary-border: 1px solid lighten($btn-primary-dark, 10%),
atum-btn-primary-bg-hvr: color.adjust($btn-primary-dark, $lightness: -15%),
atum-btn-primary-border: 1px solid color.adjust($btn-primary-dark, $lightness: 10%),
atum-btn-primary-hvr: var(--template-text-light),

atum-btn-secondary: #f0f4fb,

atum-btn-action: darken($info-dark, 10%),
atum-btn-action: color.adjust($info-dark, $lightness: -10%),
atum-btn-action-icon: var(--template-text-light),
atum-btn-action-icon-hvr: var(--atum-btn-action-hvr),
atum-btn-action-bg: $info-dark,
atum-btn-action-bg-hvr: darken($info-dark, 15%),
atum-btn-action-border: 1px solid lighten($info-dark, 10%),
atum-btn-action-bg-hvr: color.adjust($info-dark, $lightness: -15%),
atum-btn-action-border: 1px solid color.adjust($info-dark, $lightness: 10%),

atum-list-group-bg: var(--template-sidebar-bg),

Expand Down
Loading