Skip to content

Commit

Permalink
Joomla 5 back-end Atum and Fontawesome 6 #3196
Browse files Browse the repository at this point in the history
  • Loading branch information
@hexplor
hexplor committed Mar 20, 2024
1 parent 37ab661 commit 3d0084b
Show file tree
Hide file tree
Showing 11 changed files with 79 additions and 57 deletions.
5 changes: 0 additions & 5 deletions assets/common/css/font-awesome5-all.min.css
View file

This file was deleted.

5 changes: 0 additions & 5 deletions assets/common/css/font-awesome5-shim.min.css
View file

This file was deleted.

9 changes: 9 additions & 0 deletions assets/common/css/font-awesome6-all.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...s/common/css/font-awesome5-pseudo.min.css → ...s/common/css/font-awesome6-pseudo.min.css
View file

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

6 changes: 6 additions & 0 deletions assets/common/css/font-awesome6-shim.min.css
View file

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions engines/common/nucleus/templates/page_head.html.twig
View file
Expand Up @@ -3,6 +3,7 @@

{% set faEnabled = gantry.config.page.fontawesome.enable|default(1) %}
{% set faVersion = gantry.config.page.fontawesome.version ?? gantry.config.page.fontawesome.default_version ?? 'fa4' %}

{% assets with { priority: 10 } %}
{% block head_stylesheets -%}
<link rel="stylesheet" href="gantry-engine://css-compiled/nucleus.css" type="text/css"/>
Expand All @@ -16,9 +17,9 @@
{% if faVersion == 'manual' or gantry.config.page.fontawesome.html_js_import|trim %}
{{ gantry.config.page.fontawesome.html_js_import|html|raw -}}
{% elseif faVersion == 'fa5js' %}
<script type="text/javascript" src="{{ url('gantry-assets://js/font-awesome5-all.min.js') }}"></script>
<script type="text/javascript" src="{{ url('gantry-assets://js/font-awesome6-all.min.js') }}"></script>
{% if gantry.config.page.fontawesome.fa4_compatibility|default(1) %}
<script type="text/javascript" src="{{ url('gantry-assets://js/font-awesome5-shim.min.js') }}"></script>
<script type="text/javascript" src="{{ url('gantry-assets://js/font-awesome6-shim.min.js') }}"></script>
{% endif %}
{% endif %}
{% endif %}
Expand All @@ -33,12 +34,12 @@
{% elseif faVersion == 'fa4' %}
<link rel="stylesheet" href="gantry-assets://css/font-awesome.min.css" type="text/css"/>
{% elseif faVersion == 'fa5css' %}
<link rel="stylesheet" href="gantry-assets://css/font-awesome5-all.min.css" type="text/css">
<link rel="stylesheet" href="gantry-assets://css/font-awesome6-all.min.css" type="text/css">
{% if gantry.config.page.fontawesome.fa4_compatibility|default(1) %}
<link rel="stylesheet" href="gantry-assets://css/font-awesome5-shim.min.css" type="text/css">

{% endif %}
{% elseif (faVersion == 'fa5js' or (faVersion == 'manual' and gantry.config.page.fontawesome.html_js_import)) and (gantry.config.page.fontawesome.content_compatibility|default(1)) %}
<link rel="stylesheet" href="gantry-assets://css/font-awesome5-pseudo.min.css" type="text/css">
<link rel="stylesheet" href="gantry-assets://css/font-awesome6-pseudo.min.css" type="text/css">
{% endif %}
{% endif %}
{% for scss in gantry.theme.configuration.css.overrides %}
Expand Down
74 changes: 49 additions & 25 deletions package-lock.json
View file

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

6 changes: 2 additions & 4 deletions platforms/common/templates/partials/base.html.twig
View file
Expand Up @@ -2,10 +2,8 @@

{% block stylesheets %}
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css-compiled/g-admin.css') }}" type="text/css" />
{% if not gantry.platform.has('fontawesome') %}
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome5-all.min.css') }}" type="text/css" />
{% endif %}
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome5-shim.min.css') }}" type="text/css" />
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome6-all.min.css') }}" type="text/css" />
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome6-shim.min.css') }}" type="text/css" />
{{ parent() }}
{% endblock %}

Expand Down
6 changes: 2 additions & 4 deletions platforms/common/templates/partials/layout.html.twig
View file
Expand Up @@ -2,10 +2,8 @@

{% block stylesheets %}
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css-compiled/g-admin.css') }}" type="text/css" />
{% if not gantry.platform.has('fontawesome') %}
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome5-all.min.css') }}" type="text/css" />
{% endif %}
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome5-shim.min.css') }}" type="text/css" />
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome6-all.min.css') }}" type="text/css" />
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome6-shim.min.css') }}" type="text/css" />
{{ parent() }}
{% endblock %}

Expand Down
6 changes: 2 additions & 4 deletions platforms/joomla/com_gantry5/admin/templates/partials/layout.html.twig
View file
Expand Up @@ -2,10 +2,8 @@

{% block stylesheets %}
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css-compiled/g-admin.css') }}" type="text/css" />
{% if not gantry.platform.has('fontawesome') %}
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome5-all.min.css') }}" type="text/css" />
{% endif %}
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome5-shim.min.css') }}" type="text/css" />
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome6-all.min.css') }}" type="text/css" />
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome6-shim.min.css') }}" type="text/css" />
{{ parent() }}
{% endblock %}

Expand Down
6 changes: 2 additions & 4 deletions platforms/wordpress/gantry5/admin/templates/partials/inline.html.twig
View file
Expand Up @@ -2,10 +2,8 @@

{% block stylesheets %}
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css-compiled/admin.css') }}" type="text/css" />
{% if not gantry.platform.has('fontawesome') %}
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome5-all.min.css') }}" type="text/css" />
{% endif %}
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome5-shim.min.css') }}" type="text/css" />
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome6-all.min.css') }}" type="text/css" />
<link rel="stylesheet" href="{{ url('gantry-admin://assets/css/font-awesome6-shim.min.css') }}" type="text/css" />
{{ parent() }}
{% endblock %}

Expand Down

0 comments on commit 3d0084b

Please sign in to comment.