Merge branch 'bootstrap-theme-disable-fix' into '3-1-1'

Fix bootstrap-theme not disabling on Firefox

See merge request !63
master
Mike Koch 7 years ago
commit 37bd252041

@ -55,10 +55,10 @@ if (is_dir(HESK_PATH . 'install')) {
<link href="<?php echo HESK_PATH; ?>css/datepicker.css" type="text/css" rel="stylesheet"/>
<link href="<?php echo HESK_PATH; ?>css/bootstrap.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
rel="stylesheet"/>
<?php if ($modsForHesk_settings['use_bootstrap_theme'] != 0) { ?>
<link href="<?php echo HESK_PATH; ?>css/bootstrap-theme.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
rel="stylesheet" <?php if ($modsForHesk_settings['use_bootstrap_theme'] == 0) {
echo 'disabled';
} ?>>
rel="stylesheet" />
<?php } ?>
<link href="<?php echo HESK_PATH; ?>css/mods-for-hesk.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
rel="stylesheet"/>
<link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"

Loading…
Cancel
Save