moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-78052-master' of https://github.com/sarjona/moodle

Browse source
This commit is contained in:
Jake Dallimore 2023-05-03 12:06:33 +08:00
commit d2b655cbf2
19 changed files with 19 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/tool/componentlibrary/content/moodle/components/moodle-icons.md
View file

@ -11,7 +11,7 @@ tags:
## Description ## 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. If needed a theme can override this map and provide its own mapping.

BIN
lib/fonts/fa-brands-400.ttf
View file

Binary file not shown.

BIN
lib/fonts/fa-brands-400.woff2
View file

Binary file not shown.

BIN
lib/fonts/fa-regular-400.ttf
View file

Binary file not shown.

BIN
lib/fonts/fa-regular-400.woff2
View file

Binary file not shown.

BIN
lib/fonts/fa-solid-900.ttf
View file

Binary file not shown.

BIN
lib/fonts/fa-solid-900.woff2
View file

Binary file not shown.

BIN
lib/fonts/fa-v4compatibility.ttf
View file

Binary file not shown.

BIN
lib/fonts/fa-v4compatibility.woff2
View file

Binary file not shown.

2
lib/thirdpartylibs.xml
View file

@ -458,7 +458,7 @@ All rights reserved.</copyright>
<location>fonts</location> <location>fonts</location>
<name>Font Awesome - http://fontawesome.com</name> <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> <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> <license>SIL OFL</license>
<licenseversion>1.1</licenseversion> <licenseversion>1.1</licenseversion>
<repository>https://github.com/FortAwesome/Font-Awesome</repository> <repository>https://github.com/FortAwesome/Font-Awesome</repository>

2
theme/boost/scss/fontawesome/brands.scss vendored
View file

@ -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) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * Copyright 2023 Fonticons, Inc.
*/ */

2
theme/boost/scss/fontawesome/fontawesome.scss vendored
View file

@ -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) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * Copyright 2023 Fonticons, Inc.
*/ */

2
theme/boost/scss/fontawesome/readme_moodle.txt
View file

@ -16,7 +16,7 @@ Font Awesome comes in 2 parts relating to Moodle:
CHANGES 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') url('#{$fa-font-path}/fa-xxxxx-400.zzzzz') format('zzzzz')

2
theme/boost/scss/fontawesome/regular.scss vendored
View file

@ -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) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * Copyright 2023 Fonticons, Inc.
*/ */

2
theme/boost/scss/fontawesome/solid.scss vendored
View file

@ -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) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * Copyright 2023 Fonticons, Inc.
*/ */

17
theme/boost/scss/fontawesome/v4-shims.scss vendored
View file

@ -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) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * Copyright 2023 Fonticons, Inc.
*/ */
@ -9,18 +9,3 @@
@import 'functions'; @import 'functions';
@import 'variables'; @import 'variables';
@import 'shims'; @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');
}

22
theme/boost/style/moodle.css
View file

@ -1,6 +1,6 @@
@charset "UTF-8"; @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) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * 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) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * 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) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * 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) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * Copyright 2023 Fonticons, Inc.
*/ */
@ -4911,20 +4911,8 @@
font-weight: 400; 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) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * Copyright 2023 Fonticons, Inc.
*/ */

2
theme/boost/thirdpartylibs.xml
View file

@ -199,7 +199,7 @@
<location>scss/fontawesome</location> <location>scss/fontawesome</location>
<name>Font Awesome - http://fontawesome.com</name> <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> <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> <license>(MIT)</license>
<repository>https://github.com/FortAwesome/Font-Awesome</repository> <repository>https://github.com/FortAwesome/Font-Awesome</repository>
<copyrights> <copyrights>

22
theme/classic/style/moodle.css
View file

@ -1,6 +1,6 @@
@charset "UTF-8"; @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) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * 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) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * 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) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * 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) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * Copyright 2023 Fonticons, Inc.
*/ */
@ -4911,20 +4911,8 @@
font-weight: 400; 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) * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc. * Copyright 2023 Fonticons, Inc.
*/ */