Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.0-dev-c…

…om_templates * '4.0-dev' of github.com:joomla/joomla-cms: Add closing quote (#30353) [4.0] Make sure the renderer does not manipulate the inline CSS and JS (#28719) [4.0] Atum and Cassiopea Change alerts styling - space saving + (#30294) Update editor versions (#30340) [4.0][mod_menu] Add space for 'menu class' (#30341) Optimize code for aria-current (#30328) [4.0] Composer and npm updates 10 Aug (#30334) [4.0] fix js code style (#30335)
joomla · Aug 13, 2020 · 77aa39b · 77aa39b
2 parents ad9e909 + dc5dff7
commit 77aa39b
Show file tree

Hide file tree

Showing 30 changed files with 3,302 additions and 2,914 deletions.
diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss
@@ -165,8 +165,8 @@ $card-border-color:                transparent;
 
 // Alerts
 $state-success-text:               var(--alert-success);
-$state-success-bg:                 lighten($green-dark, 70%);
-$state-success-border:             lighten($green-dark, 30%);
+$state-success-bg:                 lighten($green-dark, 80%);
+$state-success-border:             $green-dark;
 
 $state-info-text:                  var(--white);
 $state-info-bg:                    var(--atum-bg-dark);

diff --git a/administrator/templates/atum/scss/blocks/_alerts.scss b/administrator/templates/atum/scss/blocks/_alerts.scss
@@ -38,7 +38,7 @@ fieldset .alert {
 }
 
 .alert-heading {
-  font-size: $font-size-lg;
+  font-size: $h4-font-size;
 }
 
 @keyframes fadeIn {
@@ -52,3 +52,4 @@ fieldset .alert {
     transform: translateY(0);
   }
 }
+
diff --git a/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss b/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss
@@ -0,0 +1,86 @@
+@import "../../variables";
+@import "../../../../../../node_modules/joomla-ui-custom-elements/dist/css/joomla-alert";
+
+// The following is a restyle for the system alerts
+
+#system-message-container joomla-alert {
+  position: relative;
+  display: flex;
+  width: 100%;
+  min-width: 16rem;
+  padding: 0;
+  margin-bottom: 1rem;
+  color: var(--atum-text-dark);
+  background-color: var(--white);
+  border: 1px solid var(--alert-accent-color, transparent);
+  border-radius: .25rem;
+  transition: opacity .15s linear;
+
+  .alert-heading {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-content: center;
+    padding: .8rem;
+    color: rgba(255, 255, 255, .95);
+    background: var(--alert-accent-color, transparent);
+  }
+
+  .alert-link {
+    color: var(--success, inherit);
+  }
+
+  &[type="success"] {
+    --alert-accent-color: var(--success);
+  }
+
+  &[type="info"] {
+    --alert-accent-color: var(--info);
+  }
+
+  &[type="warning"] {
+    --alert-accent-color: var(--warning);
+  }
+
+  &[type="danger"] {
+    --alert-accent-color: var(--danger);
+  }
+
+  .joomla-alert--close,
+  .joomla-alert-button--close {
+    position: absolute;
+    top: 0;
+    right: 0;
+    padding: .2rem .8rem;
+    font-size: 2rem;
+    color: var(--alert-accent-color);
+    background: none;
+    border: 0;
+    opacity: 1;
+
+    &:hover,
+    &:focus {
+      text-decoration: none;
+      cursor: pointer;
+      opacity: .75;
+    }
+
+    [dir=rtl] & {
+      right: auto;
+      left: 0;
+      padding: .2rem .6rem;
+    }
+  }
+
+  div {
+    font-size: 1rem;
+    .alert-message {
+      padding: .3rem 2rem .3rem .3rem;
+      margin: .5rem;
+
+      [dir=rtl] & {
+        padding: .3rem .3rem .3rem 2rem;
+      }
+    }
+  }
+}
diff --git a/build/build-modules-js/compilecss.es6.js b/build/build-modules-js/compilecss.es6.js
@@ -46,12 +46,14 @@ module.exports.compile = (options, path) => {
           `${RootPath}/templates/cassiopeia/scss/template-rtl.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`,
           `${RootPath}/administrator/templates/atum/scss/template.scss`,
           `${RootPath}/administrator/templates/atum/scss/template-rtl.scss`,
           `${RootPath}/administrator/templates/atum/scss/system/searchtools/searchtools.scss`,
           `${RootPath}/administrator/templates/atum/scss/vendor/awesomplete/awesomplete.scss`,
           `${RootPath}/administrator/templates/atum/scss/vendor/choicesjs/choices.scss`,
           `${RootPath}/administrator/templates/atum/scss/vendor/minicolors/minicolors.scss`,
+          `${RootPath}/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss`,
           `${RootPath}/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss`,
           `${RootPath}/administrator/templates/atum/scss/vendor/fontawesome-free/fontawesome.scss`,
           `${RootPath}/installation/template/scss/template.scss`,

diff --git a/build/build-modules-js/gzip-assets.es6.js b/build/build-modules-js/gzip-assets.es6.js
@@ -29,7 +29,6 @@ const handleFile = (file, enableBrotli) => {
     return;
   }
 
-
   if (file.match(/\.min\.js/) && !file.match(/\.min\.js\.gz/) && !file.match(/\.min\.js\.br/) && !file.toLowerCase().match(/json/) && !file.toLowerCase().match(/license/)) {
     // eslint-disable-next-line no-console
     console.log(`Processing: ${file}`);

diff --git a/build/build-modules-js/init.es6.js b/build/build-modules-js/init.es6.js
@@ -342,7 +342,6 @@ const recreateMediaFolder = () => {
   });
 };
 
-
 module.exports.copyAssets = (options) => {
   Promise.resolve()
     // Copy a fresh version of the files

diff --git a/build/media_source/com_media/js/edit-images.es6.js b/build/media_source/com_media/js/edit-images.es6.js
@@ -133,14 +133,11 @@ Joomla.MediaManager = Joomla.MediaManager || {};
       content: Joomla.MediaManager.Edit.current.contents.replace(`data:image/${format};base64,`, ''),
     };
 
-
     // eslint-disable-next-line prefer-destructuring
     const uploadPath = options.uploadPath;
 
-
     const url = `${options.apiBaseUrl}&task=api.files&path=${uploadPath}`;
 
-
     const type = 'application/json';
 
     forUpload[options.csrfToken] = '1';
@@ -267,7 +264,6 @@ Joomla.MediaManager = Joomla.MediaManager || {};
             data = Joomla.MediaManager.Edit.original;
           }
 
-
           // Move the container to the correct tab
           const tab = document.getElementById(target.id.replace('tab-', ''));
           tab.insertAdjacentElement('afterbegin', container);

diff --git a/build/media_source/mod_menu/js/admin-menu.es6.js b/build/media_source/mod_menu/js/admin-menu.es6.js
@@ -105,7 +105,6 @@
       }
     });
 
-
     /**
      * Sidebar Nav
      */

diff --git a/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es6.js b/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es6.js
@@ -16,7 +16,6 @@ tinymce.PluginManager.add('jdragndrop', (editor) => {
     return false;
   });
 
-
   // Notify user when file is over the drop area
   editor.on('dragover', (e) => {
     e.preventDefault();

diff --git a/build/media_source/plg_system_stats/js/stats.es6.js b/build/media_source/plg_system_stats/js/stats.es6.js
@@ -34,7 +34,6 @@
       toggler.addEventListener('click', onToggle);
     }
 
-
     // Reset the unique id
     const reset = document.getElementById(resetId);
     if (reset) {

diff --git a/build/media_source/system/js/core.es6.js b/build/media_source/system/js/core.es6.js
@@ -51,7 +51,6 @@ window.Joomla.editors.instances = window.Joomla.editors.instances || {
    */
 };
 
-
 window.Joomla.Modal = window.Joomla.Modal || {
   /**
    * *****************************************************************

diff --git a/build/media_source/system/js/core.es6/message.es6 b/build/media_source/system/js/core.es6/message.es6
@@ -75,7 +75,7 @@
 
       // Skip titles with untranslated strings
       if (typeof title !== 'undefined') {
-        titleWrapper = document.createElement('span');
+        titleWrapper = document.createElement('div');
         titleWrapper.className = 'alert-heading';
         titleWrapper.innerHTML = Joomla.Text._(type) ? Joomla.Text._(type) : type;
         messagesBox.appendChild(titleWrapper);
@@ -84,7 +84,7 @@
       // Add messages to the message box
       typeMessages.forEach((typeMessage) => {
         messageWrapper = document.createElement('div');
-        messageWrapper.innerHTML = typeMessage;
+        messageWrapper.innerHTML = `<div class="alert-message">${typeMessage}</div>`;
         messagesBox.appendChild(messageWrapper);
       });
 

diff --git a/build/media_source/system/js/showon.es6.js b/build/media_source/system/js/showon.es6.js
@@ -129,7 +129,6 @@
 
             const originId = originField.id;
 
-
             // If checkbox or radio box the value is read from properties
             if (originField.getAttribute('type') && ['checkbox', 'radio'].indexOf(originField.getAttribute('type').toLowerCase()) !== -1) {
               if (!originField.checked) {