Merge branch '5.1-dev' into 5.1/plugins/webservices/events

joomla · Oct 9, 2023 · 4df444c · 4df444c
2 parents e6534ea + 77ed08d
commit 4df444c
Show file tree

Hide file tree

Showing 20 changed files with 284 additions and 280 deletions.
diff --git a/administrator/components/com_contenthistory/src/View/History/HtmlView.php b/administrator/components/com_contenthistory/src/View/History/HtmlView.php
@@ -135,7 +135,6 @@ protected function addToolbar(): Toolbar
             ->listCheck(true);
 
         $toolbar->basicButton('keep', 'COM_CONTENTHISTORY_BUTTON_KEEP', 'history.keep')
-            ->buttonClass('btn btn-inverse')
             ->icon('icon-lock')
             ->listCheck(true);
 

diff --git a/administrator/components/com_templates/src/View/Template/HtmlView.php b/administrator/components/com_templates/src/View/Template/HtmlView.php
@@ -262,10 +262,10 @@ protected function addToolbar()
             } elseif ($this->type === 'home') {
                 // Add a copy/child template button
                 if (isset($this->template->xmldata->inheritable) && (string) $this->template->xmldata->inheritable === '1') {
-                    ToolbarHelper::modal('childModal', 'icon-copy', 'COM_TEMPLATES_BUTTON_TEMPLATE_CHILD', false);
+                    ToolbarHelper::modal('childModal', 'icon-copy', 'COM_TEMPLATES_BUTTON_TEMPLATE_CHILD');
                 } elseif (empty($this->template->xmldata->parent) && empty($this->template->xmldata->namespace)) {
                     // We can't copy parent templates nor namespaced templates
-                    ToolbarHelper::modal('copyModal', 'icon-copy', 'COM_TEMPLATES_BUTTON_COPY_TEMPLATE', false);
+                    ToolbarHelper::modal('copyModal', 'icon-copy', 'COM_TEMPLATES_BUTTON_COPY_TEMPLATE');
                 }
             }
         }

diff --git a/administrator/components/com_users/tmpl/method/edit.php b/administrator/components/com_users/tmpl/method/edit.php
@@ -49,7 +49,7 @@ class="form form-horizontal" id="com-users-method-edit" method="post">
             <?php if (!empty($this->renderOptions['help_url'])) : ?>
             <span class="float-end">
                 <a href="<?php echo $this->renderOptions['help_url'] ?>"
-                   class="btn btn-sm btn-default btn-inverse btn-dark"
+                   class="btn btn-sm btn-dark"
                    target="_blank"
                 >
                     <span class="icon icon-question-sign" aria-hidden="true"></span>

diff --git a/administrator/components/com_users/tmpl/methods/list.php b/administrator/components/com_users/tmpl/methods/list.php
@@ -131,7 +131,7 @@ class="text-warning me-1 hasTooltip"
                 <?php if ($canAddEdit && (empty($method['active']) || $method['allowMultiple'])) : ?>
                     <div class="com-users-methods-list-method-addnew-container border-top pt-2">
                         <a href="<?php echo Route::_('index.php?option=com_users&task=method.add&method=' . $this->escape(urlencode($method['name'])) . ($this->returnURL ? '&returnurl=' . $this->escape(urlencode($this->returnURL)) : '') . '&user_id=' . $this->user->id)?>"
-                           class="com-users-methods-list-method-addnew btn btn-outline-primary btn-sm"
+                           class="com-users-methods-list-method-addnew btn btn-primary btn-sm"
                         >
                             <span class="icon-plus-2" aria-hidden="true"></span>
                             <?php echo Text::sprintf('COM_USERS_MFA_ADD_AUTHENTICATOR_OF_TYPE', $method['display']) ?>

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>5.1.0-dev</version>
+	<version>5.1.0-alpha1-dev</version>
 	<creationDate>2023-10</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 

diff --git a/build/media_source/system/css/fields/calendar-rtl.css b/build/media_source/system/css/fields/calendar-rtl.css
@@ -8,6 +8,7 @@
 }
 
 .calendar-container {
+  --fallback-url: url("../../images/select-bg-rtl.svg");
   z-index: 1100 !important;
   float: left;
   min-width: 160px;
@@ -179,7 +180,7 @@ div.calendar-container table td.title { /* This holds the current "month, year"
   line-height: 1.5;
   color: var(--calendar-select-color, #212529);
   background-color: var(--calendar-select-bg-color, #f0f4fb);
-  background-image: var(--calendar-select-bg-url-rtl, url("../../images/select-bg-rtl.svg"));
+  background-image: var(--calendar-select-bg-url, var(--fallback-url));
   background-repeat: no-repeat;
   background-position: left center;
   background-size: max(100%, 58rem);

diff --git a/build/media_source/system/css/fields/calendar.css b/build/media_source/system/css/fields/calendar.css
@@ -8,6 +8,7 @@
 }
 
 .calendar-container {
+  --fallback-url: url("../../images/select-bg.svg");
   z-index: 1100 !important;
   float: left;
   min-width: 160px;
@@ -179,7 +180,7 @@ div.calendar-container table td.title { /* This holds the current "month, year"
   line-height: 1.5;
   color: var(--calendar-select-color, #212529);
   background-color: var(--calendar-select-bg-color, #f0f4fb);
-  background-image: var(--calendar-select-bg-url, url("../../images/select-bg.svg"));
+  background-image: var(--calendar-select-bg-url, var(--fallback-url));
   background-repeat: no-repeat;
   background-position: right center;
   background-size: max(100%, 58rem);

diff --git a/build/media_source/system/images/calendar-select-bg-dark-rtl.svg b/build/media_source/system/images/calendar-select-bg-dark-rtl.svg
diff --git a/build/media_source/system/images/calendar-select-bg-dark.svg b/build/media_source/system/images/calendar-select-bg-dark.svg
diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss
@@ -13,3 +13,6 @@ $form-select-background-rtl-dark:  $form-select-bg-dark $form-select-indicator-r
 
 // Alerts
 $state-info-text-dark:             var(--template-bg-dark-50);
+
+// Code-color override bootstrap for accessibility contrast
+$code-color-dark: #d7488b; //used in bootstrap
diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss
@@ -220,6 +220,7 @@ $input-group-addon-border-color:   var(--template-bg-dark);
 // Treeselect
 $treeselect-line-height:           2.2rem;
 $treeselect-indent:                40px;
+$treeselect-line-color:            var(--template-bg-dark-7);
 
 // List
 $list-group-border-color:          var(--template-bg-dark-15);

diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_calendar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_calendar.scss
@@ -2,8 +2,6 @@
   --calendar-bg: var(--body-bg);
   --calendar-week-bg: #f4f4f4;
   --calendar-buttons-color: #495057;
-  --calendar-select-bg-url: #{$form-select-indicator};
-  --calendar-select-bg-url-rtl: #{$form-select-indicator-rtl};
   --calendar-select-bg-color: #{$form-select-bg};
   --calendar-select-color: var(--body-color);
 }
@@ -12,8 +10,7 @@
   @include color-mode(dark, true) {
     --calendar-week-bg: var(--gray-700);
     --calendar-buttons-color: var(--template-bg-dark-20);
-    --calendar-select-bg-url: #{$form-select-indicator-dark};
-    --calendar-select-bg-url-rtl: #{$form-select-indicator-rtl-dark};
+    --calendar-select-bg-url: url("../../images/calendar-select-bg-dark.svg") /*rtl:url("../../images/calendar-select-bg-dark-rtl.svg")*/;
     --calendar-select-bg-color: #{$form-select-bg-dark};
   }
 }
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss b/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss
@@ -181,6 +181,11 @@ joomla-dialog {
       width: 80vw;
       height: 80vh;
     }
+
+    // Override display to flex, to scale the content to full height
+    &[open] {
+      display: flex;
+    }
   }
 
   &[type="image"] {
@@ -245,7 +250,7 @@ joomla-dialog dialog[open] {
   box-sizing: border-box;
   display: flex;
   flex-flow: column;
-  height: 100%;
+  width: 100%;
 
   .buttons-holder {
     display: flex;

diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss b/build/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss
@@ -7,7 +7,15 @@
 
   .nav-header {
     font-weight: $font-weight-bold;
-    color: $gray-900;
+    color: var(--template-bg-dark);
+  }
+
+  @if $enable-dark-mode {
+    @include color-mode(dark) {
+      .nav-header {
+        color: var(--body-color);
+      }
+    }
   }
 
   li {
@@ -24,7 +32,7 @@
       height: 1px;
       margin: auto;
       content: "";
-      background-color: rgba(0, 0, 0, .2);
+      background-color: $treeselect-line-color;
     }
 
     &::after {
@@ -35,7 +43,7 @@
       width: 1px;
       height: 100%;
       content: "";
-      background-color: rgba(0, 0, 0, .2);
+      background-color: $treeselect-line-color;
     }
 
     &:last-child {

diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss
@@ -13,11 +13,9 @@
 
   &[multiple] {
     padding: 0;
-    background-color: var(--white-offset);
 
     option {
       padding: $form-select-multiple-padding-y $form-select-padding-x;
-      background-color: var(--white-offset);
 
       &:checked {
         color: var(--template-text-light);

diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_modals.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_modals.scss
@@ -48,6 +48,11 @@ joomla-dialog {
       width: 80vw;
       height: 80vh;
     }
+
+    // Override display to flex, to scale the content to full height
+    &[open] {
+      display: flex;
+    }
   }
 
   &[type="image"] {
@@ -112,7 +117,7 @@ joomla-dialog dialog[open] {
   box-sizing: border-box;
   display: flex;
   flex-flow: column;
-  height: 100%;
+  width: 100%;
 
   .buttons-holder {
     display: flex;

diff --git a/components/com_users/tmpl/method/edit.php b/components/com_users/tmpl/method/edit.php
@@ -49,7 +49,7 @@ class="form form-horizontal" id="com-users-method-edit" method="post">
             <?php if (!empty($this->renderOptions['help_url'])) : ?>
             <span class="float-end">
                 <a href="<?php echo $this->renderOptions['help_url'] ?>"
-                   class="btn btn-sm btn-default btn-inverse btn-dark"
+                   class="btn btn-sm btn-dark"
                    target="_blank"
                 >
                     <span class="icon icon-question-sign" aria-hidden="true"></span>

diff --git a/composer.json b/composer.json
@@ -44,28 +44,28 @@
   },
   "require": {
     "php": "^8.1.0",
-    "joomla/application": "~3.0.x-dev",
-    "joomla/archive": "~3.0.x-dev",
-    "joomla/authentication": "~3.0.x-dev",
-    "joomla/console": "~3.0.x-dev",
-    "joomla/crypt": "~3.0.x-dev",
-    "joomla/data": "~3.0.x-dev",
-    "joomla/database": "~3.0.x-dev",
-    "joomla/di": "~3.0.x-dev",
-    "joomla/event": "~3.0.x-dev",
-    "joomla/filter": "~3.0.x-dev",
-    "joomla/filesystem": "~3.0.x-dev",
-    "joomla/http": "~3.0.x-dev",
-    "joomla/input": "~3.0.x-dev",
-    "joomla/language": "~3.0.x-dev",
-    "joomla/oauth1": "~3.0.x-dev",
-    "joomla/oauth2": "~3.0.x-dev",
-    "joomla/registry": "~3.0.x-dev",
-    "joomla/router": "~3.0.x-dev",
-    "joomla/session": "~3.0.x-dev",
-    "joomla/string": "~3.0.x-dev",
-    "joomla/uri": "~3.0.x-dev",
-    "joomla/utilities": "~3.0.x-dev",
+    "joomla/application": "~3.0",
+    "joomla/archive": "~3.0",
+    "joomla/authentication": "~3.0",
+    "joomla/console": "~3.0",
+    "joomla/crypt": "~3.0",
+    "joomla/data": "~3.0",
+    "joomla/database": "~3.0",
+    "joomla/di": "~3.0",
+    "joomla/event": "~3.0",
+    "joomla/filter": "~3.0",
+    "joomla/filesystem": "~3.0",
+    "joomla/http": "~3.0",
+    "joomla/input": "~3.0",
+    "joomla/language": "~3.0",
+    "joomla/oauth1": "~3.0",
+    "joomla/oauth2": "~3.0",
+    "joomla/registry": "~3.0",
+    "joomla/router": "~3.0",
+    "joomla/session": "~3.0",
+    "joomla/string": "~3.0",
+    "joomla/uri": "~3.0",
+    "joomla/utilities": "~3.0",
     "algo26-matthias/idna-convert": "^3.1.0",
     "defuse/php-encryption": "^2.4.0",
     "doctrine/inflector": "^1.4.4",
@@ -107,8 +107,8 @@
     "friendsofphp/php-cs-fixer": "3.4.0",
     "squizlabs/php_codesniffer": "^3.7.2",
     "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
-    "joomla/mediawiki": "^3.0.x-dev",
-    "joomla/test": "~3.0.x-dev",
+    "joomla/mediawiki": "^3.0",
+    "joomla/test": "~3.0",
     "phan/phan": "^5.4.2"
   },
   "replace": {