Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdeutz merged 8 commits into from
Oct 27, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8eb52e8
make svg's available
N6REJ Oct 12, 2020
f4bd926
change name to images
N6REJ Oct 14, 2020
09e317e
adds regular fa fonts back
N6REJ Oct 15, 2020
8a17b03
add .far
N6REJ Oct 15, 2020
01a1195
undo settings.json inclusion
N6REJ Oct 15, 2020
fb5cc3e
put atum imports in proper order
N6REJ Oct 16, 2020
7a5641b
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into r…
N6REJ Oct 24, 2020
6db1f84
Update _header.scss
rdeutz Oct 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion administrator/templates/atum/scss/blocks/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// Header

.header {
position: relative;
z-index: $zindex-header;
Expand Down Expand Up @@ -176,6 +175,7 @@
}
}

.far,
.fas,
.fab {
font-size: 1.5rem;
Expand Down
6 changes: 6 additions & 0 deletions administrator/templates/atum/scss/blocks/_quickicons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
transition: all .25s ease;


.far,
.fas,
.fab {
margin: 0 auto;
Expand All @@ -34,6 +35,7 @@
text-decoration: none;
background: var(--atum-link-color);

.far,
.fas,
.fab {
color: transparent;
Expand Down Expand Up @@ -141,6 +143,7 @@
&.quickicon-icon {
margin: .8rem auto 0;

&.big .far,
&.big .fas,
&.big .fab {
font-size: $quickicon-icon-size-big;
Expand Down Expand Up @@ -185,6 +188,7 @@
color: var(--white);
background: var(--danger);

.far::before,
.fas::before,
.fab::before {
color: var(--white);
Expand All @@ -196,6 +200,7 @@
color: var(--success);
border: 1px solid lighten($success-txt, 20%);

.far,
.fas,
.fab {
color: transparent;
Expand All @@ -207,6 +212,7 @@
color: var(--white);
background: var(--success);

.far::before,
.fas::before,
.fab::before {
color: transparent;
Expand Down
1 change: 1 addition & 0 deletions administrator/templates/atum/scss/vendor/bootstrap/_table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
margin-bottom: 0;
}

.inactive .far,
.inactive .fas,
.inactive .fab,
.inactive [class^=icon-] {
Expand Down
4 changes: 2 additions & 2 deletions administrator/templates/atum/scss/vendor/fontawesome-free/fontawesome.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 2 additions & 1 deletion installation/template/scss/template.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 2 additions & 1 deletion templates/cassiopeia/scss/template.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down