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

[10.0.27.dev] Taille des drapeaux

This commit is contained in:
fredtempez 2019-10-09 11:12:13 +02:00
parent c1a6401def
commit c78484d4b3
3 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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.26.dev';
const ZWII_VERSION = '10.0.27.dev';
public static $actions = [];
public static $coreModuleIds = [
@ -1217,6 +1217,7 @@ class core extends common {
$css .= 'nav{margin:0 20px 0}';
}
}
$css .= '#i18nBar {padding:' . $this->getData(['theme', 'menu', 'height']) . ';}';
$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']) . '}';
// Pied de page
$colors = helper::colorVariants($this->getData(['theme', 'footer', 'backgroundColor']));

31
core/layout/common.css
View File

@ -457,25 +457,11 @@ nav li ul {
padding-left: 10px;
}
/*
nav #i18nUserSelect {
text-align: right;
}
nav .col1,
nav .col2,
nav .col3,
nav .col4,
nav .col5,
nav .col6,
nav .col7,
nav .col8,
nav .col9,
nav .col10,
nav .col11,
nav .col12 {
padding-top: 0px;
padding-bottom: 0px ;
}
*/
nav li ul li {
display: block;
@ -565,15 +551,14 @@ ul .menuSideChild, li .menuSideChild {
/* Icones de langues du menu */
nav .flag {
height: 20px;
vertical-align: middle;
padding: 3px;
margin-top:12px;
height: 12px;
vertical-align: top;
padding: 0 3px 0 3px;
max-width:100%;
}
nav .flagSelected {
height: 27px;
height: 15px;
}
/* Paramètres du menu et de la barre de langue */
@ -582,7 +567,7 @@ nav .flagSelected {
display: inline-flex ;
}
#i18nBar {
display: inline-flex ;
display: flex ;
float: right;
}

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

@ -23,6 +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() + "}";
// 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