wait #4566 @0:10

diff --git a/inc/ws/Util/html5/twofaces/class.ws.html5.compiler.php b/inc/ws/Util/html5/twofaces/class.ws.html5.compiler.php
index a65986f97dfb122ea776bfd50c69d7c4d530fb03..393cfe10b3190a1fd33c9932b659d08e862fc312 100644 (file)
--- a/inc/ws/Util/html5/twofaces/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/twofaces/class.ws.html5.compiler.php
@@ -2262,6 +2262,26 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
         return $val ? 'true' : 'false';
     }
 
+    protected function _font($f)
+    {
+        $default = 'Arial, Helvetica, sans-serif';
+        if($f==='OpenSans') {
+            $f='Open Sans';
+        }
+        switch ($f) {
+            case 'Montserrat':
+            case 'Open Sans':
+                $this->addFontKit($f);
+                return "'" . $f . "', " . $default;
+            case 'sans-serif':
+                return $f;
+            case 'Arial':
+                return $default;
+            default:
+                return "'Open Sans', Arial, Helverica, sans-serif";
+        }
+    }
+
     protected function writeCSS($links)
     {
         $res = array();
@@ -2270,6 +2290,9 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 
         $lessContents = '';
 
+        $this->lessVariables['font'] = $this->_font($this->theme->parametres->interfaceFont);
+        $this->lessVariables['text-transform'] = $this->theme->parametres->interfaceFontUppercase ? 'uppercase' : 'inherit';
+
         $this->lessVariables['css-scale'] = $this->cssScale;
         $this->lessVariables['slider-display'] = $this->_lessBoolean($this->theme->parametres->pagesBar);
         $this->lessVariables['slider-thumb-background'] = wsHTML5::colorToCSS($this->theme->parametres->pageBarThumbBack);