Skip to content

Commit

Permalink
FontAwesome 6 bugfixes #3253
Browse files Browse the repository at this point in the history
  • Loading branch information
@hexplor
hexplor committed May 23, 2024
1 parent bbf734e commit dfddd88
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions engines/common/nucleus/blueprints/page/fontawesome.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ form:
default: fa4
options:
fa4: Font Awesome 4 (legacy)
fa5css: Font Awesome 5 Free (Webfont / CSS)
fa5js: Font Awesome 5 Free (SVG / JS)
fa5css: Font Awesome 6 Free (Webfont / CSS)
fa5js: Font Awesome 6 Free (SVG / JS)

fa4_compatibility:
type: enable.enable
Expand Down
6 changes: 3 additions & 3 deletions engines/common/nucleus/css-compiled/nucleus.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ th { text-align: left; }

.g-main-nav .g-toplevel > li.g-parent .g-menu-parent-indicator { display: inline-block; vertical-align: middle; line-height: normal; }

.g-main-nav .g-toplevel > li.g-parent .g-menu-parent-indicator:after { display: inline-block; cursor: pointer; width: 1.5rem; opacity: 0.5; font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome; font-weight: 900; content: ""; text-align: right; }
.g-main-nav .g-toplevel > li.g-parent .g-menu-parent-indicator:after { display: inline-block; cursor: pointer; width: 1.5rem; opacity: 0.5; font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome; font-weight: 900; content: ""; text-align: right; }

.g-main-nav .g-toplevel > li.g-parent.g-selected > .g-menu-item-container > .g-menu-parent-indicator:after { content: ""; }

Expand Down Expand Up @@ -407,7 +407,7 @@ th { text-align: left; }

.g-go-back a span { display: none; }

.g-go-back a:before { display: block; text-align: center; width: 1.28571em; font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome; font-weight: 900; content: ""; opacity: 0.5; }
.g-go-back a:before { display: block; text-align: center; width: 1.28571em; font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome; font-weight: 900; content: ""; opacity: 0.5; }

.g-menu-item-container > i { vertical-align: middle; margin-right: 0.2rem; }

Expand All @@ -427,7 +427,7 @@ th { text-align: left; }

#g-mobilemenu-container .g-toplevel li.g-parent .g-menu-parent-indicator { position: absolute; right: 0.938rem; text-align: center; }

#g-mobilemenu-container .g-toplevel li.g-parent .g-menu-parent-indicator:after { display: inline-block; text-align: center; opacity: 0.5; width: 1.5rem; line-height: normal; font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome; font-weight: 900; content: ""; }
#g-mobilemenu-container .g-toplevel li.g-parent .g-menu-parent-indicator:after { display: inline-block; text-align: center; opacity: 0.5; width: 1.5rem; line-height: normal; font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome; font-weight: 900; content: ""; }

#g-mobilemenu-container .g-toplevel .g-dropdown { top: 0; background: transparent; position: absolute; left: 0; right: 0; z-index: 1; transition: transform .2s ease-out; transform: translateX(100%); }

Expand Down
6 changes: 3 additions & 3 deletions engines/common/nucleus/scss/nucleus/_nav.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
cursor: pointer;
width: 1.5rem;
opacity: 0.5;
font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome;
font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome;
font-weight: 900;
content: $fa-chevron-down;
text-align: right;
Expand Down Expand Up @@ -291,7 +291,7 @@
display: block;
text-align: center;
width: 1.28571em;
font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome;
font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome;
font-weight: 900;
content: $fa-chevron-left;
opacity: 0.5;
Expand Down Expand Up @@ -368,7 +368,7 @@
opacity: 0.5;
width: 1.5rem;
line-height: normal;
font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome;
font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome;
font-weight: 900;
content: $fa-chevron-right;
}
Expand Down
2 changes: 1 addition & 1 deletion engines/grav/nucleus/scss/configuration/grav/_typography.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ $font-family-header: "Montserrat", "Helvetica", "Tahoma", "Geneva", "Arial",
$font-family-mono: "Inconsolata", monospace !default;
$font-family-serif: "Georgia", "Times", "Times New Roman", serif !default;

$icons: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome !default;
$icons: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome !default;
22 changes: 11 additions & 11 deletions platforms/common/css-compiled/g-admin.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions platforms/common/scss/admin/_layout-manager.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ $atom: #9055AF;
}

&:not(:empty):not(.no-hover):before {
font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
font-weight: 900;
content: $fa-bars;
border-radius: 3px 0 0 3px;
Expand All @@ -242,7 +242,7 @@ $atom: #9055AF;
}

&:not(:empty):not(.no-hover):not(.no-gear):after {
font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
font-weight: 900;
content: $fa-columns;
border-radius: 0 3px 3px 0;
Expand Down
6 changes: 3 additions & 3 deletions platforms/common/scss/admin/_menu.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $submenu-ratio: 60px;
#menu-editor {
.parent-indicator {
&:before {
font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
font-weight: 900;
vertical-align: middle;
display: inline-block;
Expand Down Expand Up @@ -248,7 +248,7 @@ $submenu-ratio: 60px;
text-align: center;
z-index: 5;
color: $core-text;
font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
font-weight: 900;
border-radius: 0 0 $core-border-radius $core-border-radius;
left: 50%;
Expand Down Expand Up @@ -404,7 +404,7 @@ $submenu-ratio: 60px;

&:after {
content: $fa-times-circle;
font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
font-weight: 900;
font-size: 1.5rem;
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion platforms/common/scss/admin/_navbar.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@

&:before {
content: $fa-chevron-right;
font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
font-weight: 900;
font-size: 100%;
vertical-align: middle;
Expand Down
4 changes: 2 additions & 2 deletions platforms/common/scss/admin/_selectize.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ $selectize-caret-margin-rtl: 0 4px 0 -2px;

&:after {
content: $fa-chevron-down;
font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
font-weight: 900;
display: block;
position: absolute;
Expand All @@ -255,7 +255,7 @@ $selectize-caret-margin-rtl: 0 4px 0 -2px;

&.g-dropdown-active:after {
content: $fa-chevron-up;
font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free";
font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free";
font-weight: 900;
}
}
Expand Down
2 changes: 1 addition & 1 deletion themes/helium/common/scss/helium/styles/_buttons.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

&[class*="fa-"] {
&:before, &:after {
font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome;
font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome;
font-weight: 900;
}
}
Expand Down
2 changes: 1 addition & 1 deletion themes/helium/joomla/scss/helium-joomla/styles/_modules.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@

&:before {
text-align: center;
font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome;
font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome;
font-weight: 900;
content: $fa-chevron-right;
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion themes/helium/wordpress/scss/helium-wordpress/_widgets.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
vertical-align: bottom;

&:before {
font-family: "Font Awesome 5 Pro", "Font Awesome 5 Free", FontAwesome;
font-family: "Font Awesome 6 Pro", "Font Awesome 6 Free", FontAwesome;
font-weight: 900;
margin-right: 5px;
content: $fa-tag;
Expand Down

0 comments on commit dfddd88

Please sign in to comment.