Merge branch 'release/5.5.19'

gantry · May 24, 2024 · 361de82 · 361de82
2 parents 2bf84ee + 397887e
commit 361de82
Show file tree

Hide file tree

Showing 16 changed files with 40 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 5.5.19
+## 05/23/2024
+1. [Common](#common)
+    1. [](#bugfix)
+        - Fix Joomla 5.1 "Invalid extension update" bug
+        - FontAwesome 6 Fix (#3253)
 # 5.5.18
 ## 05/22/2024
 1. [Common](#common)

diff --git a/engines/common/nucleus/blueprints/page/fontawesome.yaml b/engines/common/nucleus/blueprints/page/fontawesome.yaml
@@ -23,8 +23,8 @@ form:
       default: fa4
       options:
         fa4: Font Awesome 4 (legacy)
-        fa5css: Font Awesome 5 Free (Webfont / CSS)
-        fa5js: Font Awesome 5 Free (SVG / JS)
+        fa5css: Font Awesome 6 Free (Webfont / CSS)
+        fa5js: Font Awesome 6 Free (SVG / JS)
 
     fa4_compatibility:
       type: enable.enable

diff --git a/engines/common/nucleus/css-compiled/nucleus.css b/engines/common/nucleus/css-compiled/nucleus.css
@@ -333,7 +333,7 @@ th { text-align: left; }
 
 .g-main-nav .g-toplevel > li.g-parent .g-menu-parent-indicator { display: inline-block; vertical-align: middle; line-height: normal; }
 
-.g-main-nav .g-toplevel > li.g-parent .g-menu-parent-indicator:after { display: inline-block; cursor: pointer; width: 1.5rem; opacity: 0.5; font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome; font-weight: 900; content: ""; text-align: right; }
+.g-main-nav .g-toplevel > li.g-parent .g-menu-parent-indicator:after { display: inline-block; cursor: pointer; width: 1.5rem; opacity: 0.5; font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome; font-weight: 900; content: ""; text-align: right; }
 
 .g-main-nav .g-toplevel > li.g-parent.g-selected > .g-menu-item-container > .g-menu-parent-indicator:after { content: ""; }
 
@@ -407,7 +407,7 @@ th { text-align: left; }
 
 .g-go-back a span { display: none; }
 
-.g-go-back a:before { display: block; text-align: center; width: 1.28571em; font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome; font-weight: 900; content: ""; opacity: 0.5; }
+.g-go-back a:before { display: block; text-align: center; width: 1.28571em; font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome; font-weight: 900; content: ""; opacity: 0.5; }
 
 .g-menu-item-container > i { vertical-align: middle; margin-right: 0.2rem; }
 
@@ -427,7 +427,7 @@ th { text-align: left; }
 
 #g-mobilemenu-container .g-toplevel li.g-parent .g-menu-parent-indicator { position: absolute; right: 0.938rem; text-align: center; }
 
-#g-mobilemenu-container .g-toplevel li.g-parent .g-menu-parent-indicator:after { display: inline-block; text-align: center; opacity: 0.5; width: 1.5rem; line-height: normal; font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome; font-weight: 900; content: ""; }
+#g-mobilemenu-container .g-toplevel li.g-parent .g-menu-parent-indicator:after { display: inline-block; text-align: center; opacity: 0.5; width: 1.5rem; line-height: normal; font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome; font-weight: 900; content: ""; }
 
 #g-mobilemenu-container .g-toplevel .g-dropdown { top: 0; background: transparent; position: absolute; left: 0; right: 0; z-index: 1; transition: transform .2s ease-out; transform: translateX(100%); }
 

diff --git a/engines/common/nucleus/scss/nucleus/_nav.scss b/engines/common/nucleus/scss/nucleus/_nav.scss
@@ -60,7 +60,7 @@
 						cursor: pointer;
 						width: 1.5rem;
 						opacity: 0.5;
-						font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome;
+						font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome;
 						font-weight: 900;
 						content: $fa-chevron-down;
 						text-align: right;
@@ -291,7 +291,7 @@
 			display: block;
 		    text-align: center;
 		    width: 1.28571em;
-			font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome;
+			font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome;
 			font-weight: 900;
 			content: $fa-chevron-left;
 			opacity: 0.5;
@@ -368,7 +368,7 @@
 						opacity: 0.5;
 						width: 1.5rem;
 						line-height: normal;
-						font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome;
+						font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome;
 						font-weight: 900;
 						content: $fa-chevron-right;
 					}

diff --git a/engines/grav/nucleus/scss/configuration/grav/_typography.scss b/engines/grav/nucleus/scss/configuration/grav/_typography.scss
@@ -4,4 +4,4 @@ $font-family-header:  			"Montserrat", "Helvetica", "Tahoma", "Geneva", "Arial",
 $font-family-mono: 				"Inconsolata", monospace !default;
 $font-family-serif:				"Georgia", "Times", "Times New Roman", serif !default;
 
-$icons: 						"Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome !default;
+$icons: 						"Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome !default;
diff --git a/platforms/common/css-compiled/g-admin.css b/platforms/common/css-compiled/g-admin.css
diff --git a/platforms/common/scss/admin/_layout-manager.scss b/platforms/common/scss/admin/_layout-manager.scss
@@ -232,7 +232,7 @@ $atom: #9055AF;
                 }
 
                 &:not(:empty):not(.no-hover):before {
-                    font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
+                    font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
                     font-weight: 900;
                     content: $fa-bars;
                     border-radius: 3px 0 0 3px;
@@ -242,7 +242,7 @@ $atom: #9055AF;
                 }
 
                 &:not(:empty):not(.no-hover):not(.no-gear):after {
-                    font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
+                    font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
                     font-weight: 900;
                     content: $fa-columns;
                     border-radius: 0 3px 3px 0;

diff --git a/platforms/common/scss/admin/_menu.scss b/platforms/common/scss/admin/_menu.scss
@@ -6,7 +6,7 @@ $submenu-ratio:                 60px;
 #menu-editor {
     .parent-indicator {
         &:before {
-            font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
+            font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
             font-weight: 900;
             vertical-align: middle;
             display: inline-block;
@@ -248,7 +248,7 @@ $submenu-ratio:                 60px;
             text-align: center;
             z-index: 5;
             color: $core-text;
-            font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
+            font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
             font-weight: 900;
             border-radius: 0 0 $core-border-radius $core-border-radius;
             left: 50%;
@@ -404,7 +404,7 @@ $submenu-ratio:                 60px;
 
             &:after {
                 content: $fa-times-circle;
-                font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
+                font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
                 font-weight: 900;
                 font-size: 1.5rem;
                 position: absolute;

diff --git a/platforms/common/scss/admin/_navbar.scss b/platforms/common/scss/admin/_navbar.scss
@@ -122,7 +122,7 @@
 
             &:before {
                 content: $fa-chevron-right;
-                font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
+                font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
                 font-weight: 900;
                 font-size: 100%;
                 vertical-align: middle;

diff --git a/platforms/common/scss/admin/_selectize.scss b/platforms/common/scss/admin/_selectize.scss
@@ -240,7 +240,7 @@ $selectize-caret-margin-rtl: 0 4px 0 -2px;
 
     &:after {
         content: $fa-chevron-down;
-        font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
+        font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
         font-weight: 900;
         display: block;
         position: absolute;
@@ -255,7 +255,7 @@ $selectize-caret-margin-rtl: 0 4px 0 -2px;
 
     &.g-dropdown-active:after {
         content: $fa-chevron-up;
-        font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
+        font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
         font-weight: 900;
     }
 }

diff --git a/platforms/joomla/updates/pkg_gantry5.xml b/platforms/joomla/updates/pkg_gantry5.xml
@@ -18,7 +18,7 @@
 		<maintainer>RocketTheme, LLC</maintainer>
 		<maintainerurl>http://gantry.org</maintainerurl>
 		<section>Updates</section>
-		<targetplatform name="joomla" version="(3.9)|(3.10)|(4.0)|(4.1)|(4.2)|(4.3)|(4.4)|(5.0)"/>
+		<targetplatform name="joomla" version="(3.9)|(3.10)|(4.0)|(4.1)|(4.2)|(4.3)|(4.4)|(5.0)|(5.1)|(5.2)|(5.3)"/>
 		<php_minimum>5.6.20</php_minimum>
 	</update>
 </updates>
diff --git a/platforms/joomla/updates/tpl_g5_helium.xml b/platforms/joomla/updates/tpl_g5_helium.xml
@@ -18,7 +18,7 @@
 		<maintainer>RocketTheme, LLC</maintainer>
 		<maintainerurl>http://gantry.org</maintainerurl>
 		<section>Updates</section>
-		<targetplatform name="joomla" version="(3.9)|(3.10)|(4.0)|(4.1)|(4.2)|(4.3)|(4.4)|(5.0)"/>
+		<targetplatform name="joomla" version="(3.9)|(3.10)|(4.0)|(4.1)|(4.2)|(4.3)|(4.4)|(5.0)|(5.1)|(5.2)|(5.3)"/>
 		<php_minimum>5.6.20</php_minimum>
 	</update>
 </updates>
diff --git a/platforms/joomla/updates/tpl_g5_hydrogen.xml b/platforms/joomla/updates/tpl_g5_hydrogen.xml
@@ -18,7 +18,7 @@
 		<maintainer>RocketTheme, LLC</maintainer>
 		<maintainerurl>http://gantry.org</maintainerurl>
 		<section>Updates</section>
-		<targetplatform name="joomla" version="(3.9)|(3.10)|(4.0)|(4.1)|(4.2)|(4.3)|(4.4)|(5.0)"/>
+		<targetplatform name="joomla" version="(3.9)|(3.10)|(4.0)|(4.1)|(4.2)|(4.3)|(4.4)|(5.0)|(5.1)|(5.2)|(5.3)"/>
 		<php_minimum>5.6.20</php_minimum>
 	</update>
 </updates>
diff --git a/themes/helium/common/scss/helium/styles/_buttons.scss b/themes/helium/common/scss/helium/styles/_buttons.scss
@@ -41,7 +41,7 @@
 
         &[class*="fa-"] {
             &:before, &:after {
-                font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome;
+                font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome;
                 font-weight: 900;
             }
         }