Merge branch 'MDL-78052-402' of https://github.com/sarjona/moodle int…

…o MOODLE_402_STABLE
moodle · May 3, 2023 · 0f66c8f · 0f66c8f
2 parents a56ca93 + 99e38b7
commit 0f66c8f
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 58 deletions.
diff --git a/admin/tool/componentlibrary/content/moodle/components/moodle-icons.md b/admin/tool/componentlibrary/content/moodle/components/moodle-icons.md
@@ -11,7 +11,7 @@ tags:
 
 ## Description
 
-Most Moodle icons are rendered using the 6.3 versions of [Fontawesome](https://fontawesome.com/v6/search). Iconnames are mapped from the Moodle icon name to the Font Awesome icon names in `/lib/classes/output/icon_system_fontawesome.php`
+Most Moodle icons are rendered using the 6.4 versions of [Fontawesome](https://fontawesome.com/v6/search). Iconnames are mapped from the Moodle icon name to the Font Awesome icon names in `/lib/classes/output/icon_system_fontawesome.php`
 
 If needed a theme can override this map and provide its own mapping.
 

diff --git a/lib/fonts/fa-brands-400.ttf b/lib/fonts/fa-brands-400.ttf
diff --git a/lib/fonts/fa-brands-400.woff2 b/lib/fonts/fa-brands-400.woff2
diff --git a/lib/fonts/fa-regular-400.ttf b/lib/fonts/fa-regular-400.ttf
diff --git a/lib/fonts/fa-regular-400.woff2 b/lib/fonts/fa-regular-400.woff2
diff --git a/lib/fonts/fa-solid-900.ttf b/lib/fonts/fa-solid-900.ttf
diff --git a/lib/fonts/fa-solid-900.woff2 b/lib/fonts/fa-solid-900.woff2
diff --git a/lib/fonts/fa-v4compatibility.ttf b/lib/fonts/fa-v4compatibility.ttf
diff --git a/lib/fonts/fa-v4compatibility.woff2 b/lib/fonts/fa-v4compatibility.woff2
diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
@@ -458,7 +458,7 @@ All rights reserved.</copyright>
     <location>fonts</location>
     <name>Font Awesome - http://fontawesome.com</name>
     <description>The Font Awesome font. Font Awesome is the Internet's icon library and toolkit, used by millions of designers, developers, and content creators.</description>
-    <version>6.3.0</version>
+    <version>6.4.0</version>
     <license>SIL OFL</license>
     <licenseversion>1.1</licenseversion>
     <repository>https://github.com/FortAwesome/Font-Awesome</repository>

diff --git a/theme/boost/scss/fontawesome/brands.scss b/theme/boost/scss/fontawesome/brands.scss
@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2023 Fonticons, Inc.
  */

diff --git a/theme/boost/scss/fontawesome/fontawesome.scss b/theme/boost/scss/fontawesome/fontawesome.scss
@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2023 Fonticons, Inc.
  */

diff --git a/theme/boost/scss/fontawesome/readme_moodle.txt b/theme/boost/scss/fontawesome/readme_moodle.txt
@@ -16,7 +16,7 @@ Font Awesome comes in 2 parts relating to Moodle:
 
 CHANGES
 --------
-1. The fonts need to be provided using the [[font:core|xxxx]] method. Edit fontawesome/brands.scss, fontawesome/regular.scss, fontawesome/solid.scss and fontawesome/v4-shims.scss and replace:
+1. The fonts need to be provided using the [[font:core|xxxx]] method. Edit fontawesome/brands.scss, fontawesome/regular.scss and fontawesome/solid.scss to replace:
 
     url('#{$fa-font-path}/fa-xxxxx-400.zzzzz') format('zzzzz')
 

diff --git a/theme/boost/scss/fontawesome/regular.scss b/theme/boost/scss/fontawesome/regular.scss
@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2023 Fonticons, Inc.
  */

diff --git a/theme/boost/scss/fontawesome/solid.scss b/theme/boost/scss/fontawesome/solid.scss
@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2023 Fonticons, Inc.
  */

diff --git a/theme/boost/scss/fontawesome/v4-shims.scss b/theme/boost/scss/fontawesome/v4-shims.scss
@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2023 Fonticons, Inc.
  */
@@ -9,18 +9,3 @@
 @import 'functions';
 @import 'variables';
 @import 'shims';
-
-:root, :host {
-    --#{$fa-css-prefix}-style-family-brands: 'Font Awesome 4 Compatibility';
-    --#{$fa-css-prefix}-font-brands: normal 400 1em/1 'Font Awesome 4 Compatibility';
-  }
-
-  @font-face {
-    font-family: 'Font Awesome 4 Compatibility';
-    font-style: normal;
-    font-weight: 400;
-    font-display: $fa-font-display;
-    src:
-      url('[[font:core|fa-v4compatibility.woff2]]') format('woff2'),
-      url('[[font:core|fa-v4compatibility.ttf]]') format('truetype');
-  }
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 /*!
- * Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2023 Fonticons, Inc.
  */
@@ -2026,7 +2026,7 @@
 }
 
 /*!
- * Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2023 Fonticons, Inc.
  */
@@ -2049,7 +2049,7 @@
 }
 
 /*!
- * Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2023 Fonticons, Inc.
  */
@@ -2093,7 +2093,7 @@
 }
 
 /*!
- * Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2023 Fonticons, Inc.
  */
@@ -4911,20 +4911,8 @@
   font-weight: 400;
 }
 
-:root, :host {
-  --fa-style-family-brands: "Font Awesome 4 Compatibility";
-  --fa-font-brands: normal 400 1em/1 "Font Awesome 4 Compatibility";
-}
-
-@font-face {
-  font-family: "Font Awesome 4 Compatibility";
-  font-style: normal;
-  font-weight: 400;
-  font-display: block;
-  src: url("[[font:core|fa-v4compatibility.woff2]]") format("woff2"), url("[[font:core|fa-v4compatibility.ttf]]") format("truetype");
-}
 /*!
- * Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2023 Fonticons, Inc.
  */

diff --git a/theme/boost/thirdpartylibs.xml b/theme/boost/thirdpartylibs.xml
@@ -199,7 +199,7 @@
     <location>scss/fontawesome</location>
     <name>Font Awesome - http://fontawesome.com</name>
     <description>Font Awesome CSS, LESS, and Sass files. Font Awesome is the Internet's icon library and toolkit, used by millions of designers, developers, and content creators.</description>
-    <version>6.3.0</version>
+    <version>6.4.0</version>
     <license>(MIT)</license>
     <repository>https://github.com/FortAwesome/Font-Awesome</repository>
     <copyrights>

diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 /*!
- * Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2023 Fonticons, Inc.
  */
@@ -2026,7 +2026,7 @@
 }
 
 /*!
- * Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2023 Fonticons, Inc.
  */
@@ -2049,7 +2049,7 @@
 }
 
 /*!
- * Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2023 Fonticons, Inc.
  */
@@ -2093,7 +2093,7 @@
 }
 
 /*!
- * Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2023 Fonticons, Inc.
  */
@@ -4911,20 +4911,8 @@
   font-weight: 400;
 }
 
-:root, :host {
-  --fa-style-family-brands: "Font Awesome 4 Compatibility";
-  --fa-font-brands: normal 400 1em/1 "Font Awesome 4 Compatibility";
-}
-
-@font-face {
-  font-family: "Font Awesome 4 Compatibility";
-  font-style: normal;
-  font-weight: 400;
-  font-display: block;
-  src: url("[[font:core|fa-v4compatibility.woff2]]") format("woff2"), url("[[font:core|fa-v4compatibility.ttf]]") format("truetype");
-}
 /*!
- * Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2023 Fonticons, Inc.
  */