mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-31 21:19:49 +02:00
Code Issues Projects Releases Wiki Activity

MDL-78052 lib: Set Moodle files after Font Awesome upgrade

Browse Source
This commit is contained in:
Sara Arjona 2023-04-27 13:11:58 +02:00
parent 46190f1b05
commit 83203eef6f
7 changed files with 21 additions and 42 deletions
Show Stats 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.

5
theme/boost/scss/fontawesome/brands.scss vendored
View File

@ -16,8 +16,9 @@
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-display: $fa-font-display; font-display: $fa-font-display;
src: url('#{$fa-font-path}/fa-brands-400.woff2') format('woff2'), src:
url('#{$fa-font-path}/fa-brands-400.ttf') format('truetype'); url('[[font:core|fa-brands-400.woff2]]') format('woff2'),
url('[[font:core|fa-brands-400.ttf]]') format('truetype');
} }
.fab, .fab,

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')

5
theme/boost/scss/fontawesome/regular.scss vendored
View File

@ -16,8 +16,9 @@
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-display: $fa-font-display; font-display: $fa-font-display;
src: url('#{$fa-font-path}/fa-regular-400.woff2') format('woff2'), src:
url('#{$fa-font-path}/fa-regular-400.ttf') format('truetype'); url('[[font:core|fa-regular-400.woff2]]') format('woff2'),
url('[[font:core|fa-regular-400.ttf]]') format('truetype');
} }
.far, .far,

5
theme/boost/scss/fontawesome/solid.scss vendored
View File

@ -16,8 +16,9 @@
font-style: normal; font-style: normal;
font-weight: 900; font-weight: 900;
font-display: $fa-font-display; font-display: $fa-font-display;
src: url('#{$fa-font-path}/fa-solid-900.woff2') format('woff2'), src:
url('#{$fa-font-path}/fa-solid-900.ttf') format('truetype'); url('[[font:core|fa-solid-900.woff2]]') format('woff2'),
url('[[font:core|fa-solid-900.ttf]]') format('truetype');
} }
.fas, .fas,

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.
*/ */

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.
*/ */