lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix management of Robot font

Browse Source
This commit is contained in:
Laurent Destailleur 2020-11-28 03:32:25 +01:00
parent df461d319e
commit e4128bad80
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/main.inc.php
View File

@ -1305,6 +1305,11 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
if (GETPOSTISSET('THEME_DARKMODEENABLED')) { $themeparam .= '&THEME_DARKMODEENABLED='.GETPOST('THEME_DARKMODEENABLED', 'int'); }
if (GETPOSTISSET('THEME_SATURATE_RATIO')) { $themeparam .= '&THEME_SATURATE_RATIO='.GETPOST('THEME_SATURATE_RATIO', 'int'); }
if (!empty($conf->global->MAIN_ENABLE_FONT_ROBOTO)) {
print '<link rel="preconnect" href="https://fonts.gstatic.com">'."\n";
print '<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@100;300;400;500;700&display=swap" rel="stylesheet">'."\n";
}
if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax)
{
print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";

3
htdocs/theme/eldy/global.inc.php
View File

@ -108,6 +108,7 @@ body {
margin-bottom: 0;
margin-right: 0;
margin-left: 0;
font-weight: 300px;
<?php print 'direction: '.$langs->trans("DIRECTION").";\n"; ?>
}
@ -2161,6 +2162,8 @@ div.menu_titre {
{
padding-<?php print $left; ?>: 2px;
padding-<?php print $right; ?>: 2px;
font-family: Roboto,<?php echo $fontlist; ?>;
font-weight: 400;
}
div.mainmenu {

2
htdocs/theme/eldy/style.css.php
View File

@ -81,7 +81,7 @@ $theme = 'eldy'; // Value of theme
if (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path = '/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme = $conf->global->MAIN_OVERWRITE_THEME_RES; }
// Define image path files and other constants
$fontlist = 'roboto,arial,tahoma,verdana,helvetica'; //$fontlist='helvetica, verdana, arial, sans-serif';
$fontlist = 'arial,tahoma,verdana,helvetica'; //$fontlist='helvetica, verdana, arial, sans-serif';
//$fontlist='"open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;';
$img_head = '';
$img_button = dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png', 1);