noalyss-commit
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Noalyss-commit] [noalyss] 47/73: Fix block problem with font

From: Dany De Bontridder
Subject: [Noalyss-commit] [noalyss] 47/73: Fix block problem with font
Date: Fri, 28 May 2021 05:26:39 -0400 (EDT) 
sparkyx pushed a commit to branch master
in repository noalyss.

commit 406e9201f33b130457fdfecd72933bd520995ebc
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Tue May 4 19:25:13 2021 +0200

    Fix block problem with font
---
 html/css/style-classic7.css | 17 +++++++++--------
 include/lib/ac_common.php   | 31 ++++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/html/css/style-classic7.css b/html/css/style-classic7.css
index 56d7ed7..3067934 100644
--- a/html/css/style-classic7.css
+++ b/html/css/style-classic7.css
@@ -4,19 +4,20 @@
   */
 @font-face {
        font-family: 'SansationLight';
-       src: url('font/SansationLight/SansationLight.eot');
-       src: local('SansationLight'), 
url('font/SansationLight/SansationLight.woff') format('woff'), 
url('font/SansationLight/SansationLight.ttf') format('truetype');
+       src: url('./font/SansationLight/SansationLight.eot');
+       src: local('SansationLight'), 
+            url('./font/SansationLight/SansationLight.woff') format('woff'), 
+            url('./font/SansationLight/SansationLight.ttf') format('truetype');
 }
 @font-face {
        font-family: 'OpenSansRegular';
-       src: url('font/OpenSansRegular.eot');
-       src: local('OpenSansRegular'), url('font/OpenSansRegular.woff') 
format('woff'), url('font/OpenSansRegular.ttf') format('truetype');
-}
-/* use this class to attach this font to any element i.e. <p 
class="fontsforweb_fontid_38327">Text with this font applied</p> */
-.fontsforweb_fontid_38327 {
-       font-family: 'OpenSansRegular' !important;
+       src: url('./font/OpenSansRegular.eot');
+       src: local('OpenSansRegular'), 
+            url('./font/OpenSansRegular.woff') format('woff'), 
+            url('./font/OpenSansRegular.ttf') format('truetype');
 }
 
+
 BODY {
     font-family: Arial, Helvetica, "Liberation Sans"  , FreeSans, sans-serif 
!important;
     font-family: 'OpenSansRegular' !important;
diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php
index 331abb7..d952e4c 100644
--- a/include/lib/ac_common.php
+++ b/include/lib/ac_common.php
@@ -305,15 +305,16 @@ function html_page_start($p_theme="", $p_script="", 
$p_script2="")
        $style = "style-classic7.css";
     } // end if
        $title="NOALYSS";
-
+        
        if ( isset ($_REQUEST['ac'])) {
-               if (strpos($_REQUEST['ac'],'/') <> 0)
+            $ac=strip_tags($_REQUEST['ac']);
+               if (strpos($ac,'/') <> 0)
                {
-                       $m=  explode('/',$_REQUEST['ac']);
+                       $m=  explode('/',$ac);
                        $title=$m[count($m)-1]."  ".$title;
                }
                else
-                       $title=$_REQUEST['ac']."  ".$title;
+                       $title=$ac."  ".$title;
        }
     $is_msie=is_msie();
     
@@ -329,13 +330,18 @@ function html_page_start($p_theme="", $p_script="", 
$p_script2="")
     }
     echo "<HTML>";
     
-    if ($p_script2 != "")
-       $p_script2 = '<script src="' . $p_script2 . '?version='.SVNINFO.'" 
type="text/javascript"></script>';
+    if ($p_script2!="")
+    {
+        $p_script2='<script src="'.$p_script2.'" 
type="text/javascript"></script>';
+    }
     $style=trim($style);
     echo "<HEAD>";
     echo '<meta charset="utf-8">';
     echo "<META http-equiv=\"Content-Type\" content=\"text/html; 
charset=UTF-8\">";
-    if ( $is_msie == 1 )echo '      <meta http-equiv="x-ua-compatible" 
content="IE=edge"/>';
+    if ($is_msie==1)
+    {
+        echo '      <meta http-equiv="x-ua-compatible" content="IE=edge"/>';
+    }
     echo "
     <TITLE>$title</TITLE>
        <link rel=\"icon\" type=\"image/ico\" href=\"favicon.ico\" />
@@ -348,6 +354,11 @@ function html_page_start($p_theme="", $p_script="", 
$p_script2="")
     <link rel=\"stylesheet\" type=\"text/css\" 
href=\"css/style-print.css?version=".SVNINFO."\" media=\"print\"/>" .
     $p_script2 . "
     ";
+    // preload font
+    echo    '<link rel="preload" href="./css/font/OpenSansRegular.woff" 
as="font" crossorigin="anonymous" />';
+    echo    '<link rel="preload" 
href="./css/font/SansationLight/SansationLight.woff" as="font" 
crossorigin="anonymous" />';
+    echo    '<link rel="preload" href="./css/font/fontello/fontello.woff" 
as="font" crossorigin="anonymous" />';
+    
     echo '<script language="javascript" src="js/calendar.js"></script>
     <script type="text/javascript" src="js/lang/calendar-en.js"></script>';
 
@@ -419,8 +430,10 @@ function html_min_page_start($p_theme="", $p_script="", 
$p_script2="")
     echo "<HTML>";
 
 
-    if ($p_script2 != "")
-       $p_script2 = '<script src="' . $p_script2 . '" 
type="text/javascript"></script>';
+    if ($p_script2!="")
+    {
+        $p_script2='<script src="'.$p_script2.'" 
type="text/javascript"></script>';
+    }
 
     echo "<HEAD>
     <TITLE>NOALYSS</TITLE>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]