admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FCLT#72427 Font Awesome 'Brands' en 'Thin' niet toevoegen, en S(fg_symbolfont) invoegen ipv het hardcoded font

Browse Source 
svn path=/Website/trunk/; revision=57595
This commit is contained in:
Koen Reefman
2022-10-11 17:48:41 +00:00
parent e6f51fec34
commit 779d4433d9
7 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/FAC/cad_verify_font.asp
View File

@@ -25,7 +25,7 @@ DOCTYPE_Disable = 1;
y.SetLayers("CONT*", "CONT*")
y.LoadStream(xc.EplotSections.Item(0))
y.SetSymbolFont("Font Awesome 6 Pro Regular", 1000)
y.SetSymbolFont(S("fg_symbolfont"), 1000)
symb = y.AddSymbol(600, 500, "@0000e002"); // Koffiekan
symb.scale = 0.4;

2
APPL/FAC/fac_verify.inc
View File

@@ -1855,7 +1855,7 @@ checker("SLNKDWF Installed",
}
)
checker("Font Awesome 6 Pro Regular installed",
checker(safe.html(S("fg_symbolfont")) + " installed (setting S('fg_symbolfont'))",
function ()
{
try

6
APPL/FontAwesome/css/brands.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
APPL/FontAwesome/css/thin.min.css vendored
View File

@@ -1,6 +0,0 @@
/*!
* Font Awesome Pro 6.2.0 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license (Commercial License)
* Copyright 2022 Fonticons, Inc.
*/
:host,:root{--fa-style-family-classic:"Font Awesome 6 Pro";--fa-font-thin:normal 100 1em/1 "Font Awesome 6 Pro"}@font-face{font-family:"Font Awesome 6 Pro";font-style:normal;font-weight:100;font-display:block;src:url(../webfonts/fa-thin-100.woff2) format("woff2")}.fa-thin,.fat{font-weight:100}

BIN
APPL/FontAwesome/webfonts/fa-brands-400.woff2
View File

Binary file not shown.

BIN
APPL/FontAwesome/webfonts/fa-thin-100.woff2
View File

Binary file not shown.

4
APPL/Shared/header.inc
View File

@@ -233,11 +233,9 @@ FCLTHeader =
{
Response.Write("</script>");
FCLTHeader.AddStylesheet(rooturl + "/appl/fontawesome/css/fontawesome.min.css");
FCLTHeader.AddStylesheet(rooturl + "/appl/fontawesome/css/thin.min.css");
FCLTHeader.AddStylesheet(rooturl + "/appl/fontawesome/css/light.min.css");
FCLTHeader.AddStylesheet(rooturl + "/appl/fontawesome/css/regular.min.css");
FCLTHeader.AddStylesheet(rooturl + "/appl/fontawesome/css/solid.min.css");
FCLTHeader.AddStylesheet(rooturl + "/appl/fontawesome/css/brands.min.css");
Response.Write("</head><body>" + L("lcl_shared_pin_removed_error") + "</body></html>");
Response.End;
}
@@ -278,11 +276,9 @@ FCLTHeader =
%> <script type="text/javascript" src="<%=this.AddTimeStamp(rooturl + '/appl/LocalScripts/FcltMgr.js')%>"></script><%
FCLTHeader.AddStylesheet(rooturl + "/appl/fontawesome/css/fontawesome.min.css");
FCLTHeader.AddStylesheet(rooturl + "/appl/fontawesome/css/thin.min.css");
FCLTHeader.AddStylesheet(rooturl + "/appl/fontawesome/css/light.min.css");
FCLTHeader.AddStylesheet(rooturl + "/appl/fontawesome/css/regular.min.css");
FCLTHeader.AddStylesheet(rooturl + "/appl/fontawesome/css/solid.min.css");
FCLTHeader.AddStylesheet(rooturl + "/appl/fontawesome/css/brands.min.css");
if (params.outputmode == 1 || params.outputmode == 5) { // Printen is vrij kaal
FCLTHeader.AddStylesheet(rooturl+"/appl/shared/default-print.css");
if (getQParam('autosortby', "") || getFParam('autosortby', "")) // Deze zijn wel nodig bij printen