ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 146 Activity

[10.0.52.dev) suppression line height dans thme.css + image map

This commit is contained in:
fredtempez 2019-10-24 23:07:35 +02:00
parent 623b5d0395
commit ee0e159edf
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/core.php
View File

@ -31,7 +31,7 @@ class common {
const TEMP_DIR = 'site/tmp/';
// Numéro de version
const ZWII_VERSION = '10.0.51.dev';
const ZWII_VERSION = '10.0.52.dev';
public static $actions = [];
public static $coreModuleIds = [
@ -112,7 +112,7 @@ class common {
// 'codemirror', // Désactivé par défaut
'tippy',
'zwiico',
// 'imagemap',
'imagemap',
'simplelightbox'
],
'view' => ''
@ -163,8 +163,8 @@ class common {
if (file_exists(self::DATA_DIR . 'core.json') === true &&
$this->getData(['core','dataVersion']) < 10000) {
$this->importData();
//common::$importNotices [] = "Importation réalisée avec succès" ;
echo '<script>window.location.replace("' . helper::baseUrl() . $this->getData(['config','homePageId']) . '")</script>';
common::$importNotices [] = "Importation réalisée avec succès" ;
//echo '<script>window.location.replace("' . helper::baseUrl() . $this->getData(['config','homePageId']) . '")</script>';
}
// Installation fraîche, initialisation des modules manquants
@ -1257,7 +1257,7 @@ class core extends common {
$css .= 'nav{margin:0 20px 0}';
}
}
$css .= '#i18nBar {padding:' . $this->getData(['theme', 'menu', 'height']) . ';}';
//$css .= '#i18nBar {padding:' . $this->getData(['theme', 'menu', 'height']) . ';}';
$colors = helper::colorVariants($this->getData(['theme', 'menu', 'backgroundColor']));
$css .= 'nav #burgerText {color:' . $colors['text'] . ';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'menu', 'font'])) . '",sans-serif;' . 'font-weight:' . $this->getData(['theme', 'menu', 'fontWeight']) . ';text-transform:' . $this->getData(['theme', 'menu', 'textTransform']) . '}';
$css .= '#toggle span,#menu a{padding:' . $this->getData(['theme', 'menu', 'height']) .';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'menu', 'font'])) . '",sans-serif;font-weight:' . $this->getData(['theme', 'menu', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'menu', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'menu', 'textTransform']) . '}';

7
core/layout/common.css
View File

@ -596,9 +596,9 @@ ul .menuSideChild, li .menuSideChild {
/* Icones de langues du menu */
nav .flag {
height: 12px;
vertical-align: top;
padding: 0 3px 0 3px;
max-width:100%;
max-height:100%;
}
nav .flagSelected {
@ -608,10 +608,11 @@ nav .flagSelected {
/* Paramètres du menu et de la barre de langue */
#menuBar {
display: inline-flex ;
display: inline-flex;
}
#i18nBar {
display: flex ;
margin: 5px;
display: inline-flex;
float: right;
}

2
core/module/theme/view/menu/menu.js.php
View File

@ -23,7 +23,7 @@ $("input, select").on("change", function() {
css += "nav a,#toggle span,nav a:hover{color:" + $("#themeMenuTextColor").val() + "}";
css += "nav a:hover{background-color:" + colors.darken + "}";
css += "nav a.active{background-color:" + colors.veryDarken + "}";
css += "#i18nBar {padding:" + $("#themeMenuHeight").val() + "}";
//css += "#i18nBar {padding:" + $("#themeMenuHeight").val() + "}";
// Taille, hauteur, épaisseur et capitalisation de caractères du menu
css += "#toggle span,#menu a{padding:" + $("#themeMenuHeight").val() + ";font-family:'" + menuFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeMenuFontWeight").val() + ";font-size:" + $("#themeMenuFontSize").val() + ";text-transform:" + $("#themeMenuTextTransform").val() + "}";
// Alignement du menu