lapervenche/ZwiiCMS
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Issues Pull Requests Projects Releases Activity

Merge branch 'master' into dev10

Browse Source
This commit is contained in:
Fred Tempez 2020-03-16 15:29:13 +01:00
commit 0ed05e545f
17 changed files with 132 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/module/config/view/index/index.css
View File

@ -28,5 +28,12 @@ textarea,
.inputFile,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
color: rgba(33, 34, 35, 1);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

7
core/module/page/view/edit/edit.css
View File

@ -29,4 +29,11 @@ textarea,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

7
core/module/theme/view/advanced/advanced.css
View File

@ -29,4 +29,11 @@ textarea,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

7
core/module/theme/view/body/body.css
View File

@ -32,4 +32,11 @@ textarea,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

7
core/module/theme/view/footer/footer.css
View File

@ -29,4 +29,11 @@ textarea,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

7
core/module/theme/view/header/header.css
View File

@ -29,4 +29,11 @@ textarea,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

7
core/module/theme/view/index/index.css
View File

@ -74,4 +74,11 @@ textarea,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

7
core/module/theme/view/manage/manage.css
View File

@ -29,4 +29,11 @@ textarea,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

7
core/module/theme/view/menu/menu.css
View File

@ -29,4 +29,11 @@ textarea,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

40
core/module/theme/view/menu/menu.php
View File

@ -54,26 +54,6 @@
</div>
</div>
</div>
<div class="row">
<div class="col12">
<div class="block">
<h4>Contenus</h4>
<div class="row">
<div class="col6">
<?php echo template::checkbox('themeMenuLoginLink', true, 'Lien de connexion', [
'checked' => $this->getData(['theme', 'menu', 'loginLink'])
]); ?>
</div>
<div class="col6">
<?php echo template::checkbox('themeMenuBurgerTitle', true, 'Titre du site dans le menu réduit', [
'checked' => $this->getData(['theme', 'menu', 'burgerTitle']),
'help' => 'Le menu burger remplace le menu complet lorsque la largeur de l\'écran n\'est pas suffisante.'
]); ?>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col12">
<div class="block">
@ -168,4 +148,24 @@
</div>
</div>
</div>
<div class="row">
<div class="col12">
<div class="block">
<h4>Contenus</h4>
<div class="row">
<div class="col6">
<?php echo template::checkbox('themeMenuLoginLink', true, 'Lien de connexion', [
'checked' => $this->getData(['theme', 'menu', 'loginLink'])
]); ?>
</div>
<div class="col6">
<?php echo template::checkbox('themeMenuBurgerTitle', true, 'Titre du site dans le menu réduit', [
'checked' => $this->getData(['theme', 'menu', 'burgerTitle']),
'help' => 'Le menu burger remplace le menu complet lorsque la largeur de l\'écran n\'est pas suffisante.'
]); ?>
</div>
</div>
</div>
</div>
</div>
<?php echo template::formClose(); ?>

10
core/module/theme/view/site/site.css
View File

@ -30,10 +30,16 @@ textarea,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}
body:not(.preview) {
font-family: "Open+Sans",sans-serif;
}
h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}
div.preview {
border-radius: 2%;
-webkit-box-shadow: 5px 5px 5px 2px rgba(0,0,0,0.75);
-moz-box-shadow: 5px 5px 5px 2px rgba(0,0,0,0.75);
box-shadow: 5px 5px 5px 2px rgba(0,0,0,0.75);
}
}

17
core/module/theme/view/site/site.js.php
View File

@ -19,13 +19,16 @@ $( document ).ready(function() {
// Import des polices de caractères
var titleFont = $("#themeTitleFont").val();
var textFont = $("#themeTextFont").val();
var css = "@import url('https://fonts.googleapis.com/css?family=" + titleFont + "|" + textFont + "');";
var colors = core.colorVariants($("#themeButtonBackgroundColor").val());
// Texte
css += "p.preview{color:" + $("#themeTextTextColor").val() + ";font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
// Titres
css += "h1.preview,h3.preview{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
css += "p.preview{color:" + $("#themeTextTextColor").val() + "}";
css += "div.preview{background-color:" + $("#themeSiteBackgroundColor").val() + ";}";
// Fond
css += "div.preview{background-color:" + $("#themeSiteBackgroundColor").val() + ";}";
// Couleurs des liens
colors = core.colorVariants($("#themeLinkTextColor").val());
@ -73,9 +76,11 @@ $("input, select").on("change", function() {
//css += "h1,h2,h3,h4,h5,h6{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
css += "h1.preview,h3.preview{color:" + $("#themeTitleTextColor").val() + ";font-family:'" + titleFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeTitleFontWeight").val() + ";text-transform:" + $("#themeTitleTextTransform").val() + "}";
// Police de caractères
css += "body{font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
//css += "body{font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
// Police + couleur
css += "p.preview{color:" + $("#themeTextTextColor").val() + ";font-family:'" + textFont.replace(/\+/g, " ") + "',sans-serif}";
// Taille du texte
css += "body,.row > div{font-size:" + $("#themeTextFontSize").val() + "}";
//css += "body,.row > div{font-size:" + $("#themeTextFontSize").val() + "}";
// Couleur du texte
//css += "body,.block h4,input[type='email'],input[type='text'],input[type='password'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:" + $("#themeTextTextColor").val() + "}";
css += "p.preview{color:" + $("#themeTextTextColor").val() + "}";

2
core/module/theme/view/site/site.php
View File

@ -64,7 +64,7 @@
</div>
</div>
<div class="col4 preview">
<h1 class="preview">Aperçu</h1>
<h1>Aperçu</h1>
<div class="row">
<div class="col8">
<h3 class="preview">Titre 3 </h3>

7
core/module/user/view/add/add.css
View File

@ -29,4 +29,11 @@ textarea,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

7
core/module/user/view/edit/edit.css
View File

@ -29,4 +29,11 @@ textarea,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

7
core/module/user/view/index/index.css
View File

@ -29,4 +29,11 @@ textarea,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}

7
core/module/user/view/reset/reset.css
View File

@ -29,4 +29,11 @@ textarea,
.button.buttonGrey,
.button.buttonGrey:hover {
color: rgba(33, 34, 35, 1);
}
body {
font-family: "Open+Sans";
}
body h1, h2, h3, h4, h5, h6 {
font-family: "Oswald";
color: rgba(74, 105, 189, 1);
}