mirror of
https://github.com/moodle/moodle.git
synced 2025-08-10 03:16:42 +02:00
Merge branch 'MDL-78052-master' of https://github.com/sarjona/moodle
This commit is contained in:
commit
d2b655cbf2
19 changed files with 19 additions and 58 deletions
2
theme/boost/scss/fontawesome/brands.scss
vendored
2
theme/boost/scss/fontawesome/brands.scss
vendored
|
@ -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.
|
||||
*/
|
||||
|
|
|
@ -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.
|
||||
*/
|
||||
|
|
|
@ -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')
|
||||
|
||||
|
|
2
theme/boost/scss/fontawesome/regular.scss
vendored
2
theme/boost/scss/fontawesome/regular.scss
vendored
|
@ -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.
|
||||
*/
|
||||
|
|
2
theme/boost/scss/fontawesome/solid.scss
vendored
2
theme/boost/scss/fontawesome/solid.scss
vendored
|
@ -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.
|
||||
*/
|
||||
|
|
17
theme/boost/scss/fontawesome/v4-shims.scss
vendored
17
theme/boost/scss/fontawesome/v4-shims.scss
vendored
|
@ -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');
|
||||
}
|
||||
|
|
|
@ -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.
|
||||
*/
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue