Merge branch 'remove-fa-pro' into cleanup

This commit is contained in:
Jens M. Sauer 2024-07-28 18:40:24 +02:00
commit 80e0f7e2d2
25 changed files with 29 additions and 29 deletions

6
assets/css/brands.min.css vendored Normal file

File diff suppressed because one or more lines are too long

9
assets/css/fontawesome.min.css vendored Normal file

File diff suppressed because one or more lines are too long

6
assets/css/solid.min.css vendored Normal file
View File

@ -0,0 +1,6 @@
/*!
* Font Awesome Free 6.6.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 2024 Fonticons, Inc.
*/
:host,:root{--fa-style-family-classic:"Font Awesome 6 Free";--fa-font-solid:normal 900 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.ttf) format("truetype")}.fa-solid,.fas{font-weight:900}

View File

@ -29,7 +29,7 @@
&.brands {
&:before {
font-family: 'Font Awesome 5 Brands';
font-family: 'Font Awesome 6 Brands';
}
}
@ -94,4 +94,4 @@
}
}
@include color-icon;
@include color-icon;

View File

@ -22,14 +22,14 @@
text-transform: none !important;
@if ($category == brands) {
font-family: 'Font Awesome 5 Brands';
font-family: 'Font Awesome 6 Brands';
}
@elseif ($category == solid) {
font-family: 'Font Awesome 5 Pro';
font-family: 'Font Awesome 6 Free';
font-weight: 900;
}
@else {
font-family: 'Font Awesome 5 Pro';
font-family: 'Font Awesome 6 Free';
font-weight: 400;
}
@ -75,4 +75,4 @@
@return url("data:image/svg+xml;charset=utf8,#{$svg}");
}
}

View File

@ -13,8 +13,3 @@
Images courtesy of <a target="_blank" href="https://unsplash.com">Unsplash</a></p>
</div>
</footer>
<!-- FontAwesome JS -->
{{ range .Site.Params.asset.fontawesome_js -}}
<script type="text/javascript" src="{{ . | absURL }}"></script>
{{- end }}

View File

@ -23,12 +23,8 @@
{{ $noscript := resources.Get "sass/noscript.scss" | resources.ExecuteAsTemplate "noscript.scss" . | toCSS (dict "targetPath" "css/noscript.css" "enableSourceMap" false) }}
<noscript><link rel="stylesheet" href="{{ ($noscript | minify).RelPermalink }}" /></noscript>
{{end}}
{{ with resources.Get "css/source-sans.css" | minify | fingerprint }}
{{ with resources.Match "css/*.css" | resources.Concat "css/bundle.css" | minify | fingerprint }}
<link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
{{ end }}
<!-- FontAwesome CSS -->
{{ range .Site.Params.asset.fontawesome_css -}}
<link rel="stylesheet" href="{{ . | absURL }}">
{{- end }}
</head>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.