joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-25 14:53:01 +00:00
Code Packages Releases Activity

[4.0] add fa Regular icons back into core availability (#31096)

Browse Source 
* make svg's available

* change name to images

* adds regular fa fonts back

* add .far

* undo settings.json inclusion

* put atum imports in proper order

* Update _header.scss

small change to let ci run again

Co-authored-by: Robert Deutz <rdeutz@googlemail.com>
This commit is contained in:
Bear 2020-10-27 08:49:39 -05:00 committed by GitHub
parent 060ff4378f
commit 2c8e054a1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
administrator/templates/atum/scss/blocks/_header.scss
View File

@ -1,5 +1,4 @@
// Header
.header {
position: relative;
z-index: $zindex-header;
@ -176,6 +175,7 @@
}
}
.far,
.fas,
.fab {
font-size: 1.5rem;

6
administrator/templates/atum/scss/blocks/_quickicons.scss
View File

@ -15,6 +15,7 @@
transition: all .25s ease;
.far,
.fas,
.fab {
margin: 0 auto;
@ -34,6 +35,7 @@
text-decoration: none;
background: var(--atum-link-color);
.far,
.fas,
.fab {
color: transparent;
@ -141,6 +143,7 @@
&.quickicon-icon {
margin: .8rem auto 0;
&.big .far,
&.big .fas,
&.big .fab {
font-size: $quickicon-icon-size-big;
@ -185,6 +188,7 @@
color: var(--white);
background: var(--danger);
.far::before,
.fas::before,
.fab::before {
color: var(--white);
@ -196,6 +200,7 @@
color: var(--success);
border: 1px solid lighten($success-txt, 20%);
.far,
.fas,
.fab {
color: transparent;
@ -207,6 +212,7 @@
color: var(--white);
background: var(--success);
.far::before,
.fas::before,
.fab::before {
color: transparent;

1
administrator/templates/atum/scss/vendor/bootstrap/_table.scss vendored
View File

@ -68,6 +68,7 @@
margin-bottom: 0;
}
.inactive .far,
.inactive .fas,
.inactive .fab,
.inactive [class^=icon-] {

4
administrator/templates/atum/scss/vendor/fontawesome-free/fontawesome.scss vendored
View File

@ -3,10 +3,10 @@ $fa-font-path: "../../../../../../media/vendor/fontawesome-free/webfonts" !defau
// Font Awesome 5 Free
@import "../../../../../../media/vendor/fontawesome-free/scss/fontawesome";
@import "../../../../../../media/vendor/fontawesome-free/scss/brands";
@import "../../../../../../media/vendor/fontawesome-free/scss/regular";
@import "../../../../../../media/vendor/fontawesome-free/scss/solid";
@import "../../../../../../media/vendor/fontawesome-free/scss/brands";
@import "../../../../../../media/vendor/fontawesome-free/scss/fontawesome";
// B/C for Icomoon
@import "../../../../../../build/media_source/system/scss/icomoon";

3
installation/template/scss/template.scss
View File

@ -7,8 +7,9 @@ $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts";
// "Font Awesome 5 Free"
@import "../../../media/vendor/fontawesome-free/scss/fontawesome";
@import "../../../media/vendor/fontawesome-free/scss/solid";
@import "../../../media/vendor/fontawesome-free/scss/brands";
@import "../../../media/vendor/fontawesome-free/scss/regular";
@import "../../../media/vendor/fontawesome-free/scss/solid";
// Backend Template stuff
@import "../../../administrator/templates/atum/scss/mixin";

3
templates/cassiopeia/scss/template.scss
View File

@ -14,8 +14,9 @@
// "Font Awesome 5 Free"
@import "../../../media/vendor/fontawesome-free/scss/fontawesome";
@import "../../../media/vendor/fontawesome-free/scss/solid";
@import "../../../media/vendor/fontawesome-free/scss/brands";
@import "../../../media/vendor/fontawesome-free/scss/regular";
@import "../../../media/vendor/fontawesome-free/scss/solid";
// B/C for Icomoon
@import "../../../build/media_source/system/scss/icomoon";