From 0c65fc56bb44baadc8045a75e6bc450b8d81f5cd Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Mon, 16 Mar 2020 15:25:31 +0100 Subject: [PATCH 1/2] =?UTF-8?q?[9.2.25]=20Th=C3=A8me=20des=20pages=20d'adm?= =?UTF-8?q?in?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/config/view/index/index.css | 9 ++++++++- core/module/page/view/edit/edit.css | 7 +++++++ core/module/theme/view/advanced/advanced.css | 7 +++++++ core/module/theme/view/body/body.css | 7 +++++++ core/module/theme/view/footer/footer.css | 7 +++++++ core/module/theme/view/header/header.css | 7 +++++++ core/module/theme/view/index/index.css | 7 +++++++ core/module/theme/view/manage/manage.css | 7 +++++++ core/module/theme/view/menu/menu.css | 7 +++++++ core/module/theme/view/site/site.css | 10 ++++++++-- core/module/theme/view/site/site.js.php | 17 +++++++++++------ core/module/theme/view/site/site.php | 2 +- core/module/user/view/add/add.css | 7 +++++++ core/module/user/view/edit/edit.css | 7 +++++++ core/module/user/view/index/index.css | 7 +++++++ core/module/user/view/reset/reset.css | 7 +++++++ 16 files changed, 112 insertions(+), 10 deletions(-) diff --git a/core/module/config/view/index/index.css b/core/module/config/view/index/index.css index 94be3bfa..0d42a8df 100644 --- a/core/module/config/view/index/index.css +++ b/core/module/config/view/index/index.css @@ -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); } \ No newline at end of file diff --git a/core/module/page/view/edit/edit.css b/core/module/page/view/edit/edit.css index 94be3bfa..cb22eb5e 100644 --- a/core/module/page/view/edit/edit.css +++ b/core/module/page/view/edit/edit.css @@ -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); } \ No newline at end of file diff --git a/core/module/theme/view/advanced/advanced.css b/core/module/theme/view/advanced/advanced.css index 94be3bfa..cb22eb5e 100644 --- a/core/module/theme/view/advanced/advanced.css +++ b/core/module/theme/view/advanced/advanced.css @@ -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); } \ No newline at end of file diff --git a/core/module/theme/view/body/body.css b/core/module/theme/view/body/body.css index 2423d11e..1ca1fa38 100644 --- a/core/module/theme/view/body/body.css +++ b/core/module/theme/view/body/body.css @@ -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); } \ No newline at end of file diff --git a/core/module/theme/view/footer/footer.css b/core/module/theme/view/footer/footer.css index 94be3bfa..cb22eb5e 100644 --- a/core/module/theme/view/footer/footer.css +++ b/core/module/theme/view/footer/footer.css @@ -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); } \ No newline at end of file diff --git a/core/module/theme/view/header/header.css b/core/module/theme/view/header/header.css index 94be3bfa..cb22eb5e 100644 --- a/core/module/theme/view/header/header.css +++ b/core/module/theme/view/header/header.css @@ -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); } \ No newline at end of file diff --git a/core/module/theme/view/index/index.css b/core/module/theme/view/index/index.css index 3786ec1e..75163439 100755 --- a/core/module/theme/view/index/index.css +++ b/core/module/theme/view/index/index.css @@ -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); } \ No newline at end of file diff --git a/core/module/theme/view/manage/manage.css b/core/module/theme/view/manage/manage.css index 94be3bfa..cb22eb5e 100644 --- a/core/module/theme/view/manage/manage.css +++ b/core/module/theme/view/manage/manage.css @@ -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); } \ No newline at end of file diff --git a/core/module/theme/view/menu/menu.css b/core/module/theme/view/menu/menu.css index 94be3bfa..cb22eb5e 100644 --- a/core/module/theme/view/menu/menu.css +++ b/core/module/theme/view/menu/menu.css @@ -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); } \ No newline at end of file diff --git a/core/module/theme/view/site/site.css b/core/module/theme/view/site/site.css index 3a9ba1db..3e62f47d 100644 --- a/core/module/theme/view/site/site.css +++ b/core/module/theme/view/site/site.css @@ -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); -} \ No newline at end of file +} diff --git a/core/module/theme/view/site/site.js.php b/core/module/theme/view/site/site.js.php index a1f3ec6b..878f5b8e 100755 --- a/core/module/theme/view/site/site.js.php +++ b/core/module/theme/view/site/site.js.php @@ -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() + "}"; diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php index 9fb47d8c..e1af5c5f 100755 --- a/core/module/theme/view/site/site.php +++ b/core/module/theme/view/site/site.php @@ -64,7 +64,7 @@
-

Aperçu

+

Aperçu

Titre 3

diff --git a/core/module/user/view/add/add.css b/core/module/user/view/add/add.css index 94be3bfa..cb22eb5e 100644 --- a/core/module/user/view/add/add.css +++ b/core/module/user/view/add/add.css @@ -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); } \ No newline at end of file diff --git a/core/module/user/view/edit/edit.css b/core/module/user/view/edit/edit.css index 94be3bfa..cb22eb5e 100644 --- a/core/module/user/view/edit/edit.css +++ b/core/module/user/view/edit/edit.css @@ -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); } \ No newline at end of file diff --git a/core/module/user/view/index/index.css b/core/module/user/view/index/index.css index 94be3bfa..cb22eb5e 100644 --- a/core/module/user/view/index/index.css +++ b/core/module/user/view/index/index.css @@ -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); } \ No newline at end of file diff --git a/core/module/user/view/reset/reset.css b/core/module/user/view/reset/reset.css index 94be3bfa..cb22eb5e 100644 --- a/core/module/user/view/reset/reset.css +++ b/core/module/user/view/reset/reset.css @@ -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); } \ No newline at end of file From 01b5f3458a2f6b512dae31d8179a243377d999fe Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Mon, 16 Mar 2020 15:27:53 +0100 Subject: [PATCH 2/2] =?UTF-8?q?[9.2.25]=20Th=C3=A8me=20menu=20monter=20la?= =?UTF-8?q?=20boite=20fonte=20pour=20faciliter=20la=20pr=C3=A9visualition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/theme/view/menu/menu.php | 40 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php index e4f56025..ebad3461 100755 --- a/core/module/theme/view/menu/menu.php +++ b/core/module/theme/view/menu/menu.php @@ -54,26 +54,6 @@
-
-
-
-

Contenus

-
-
- $this->getData(['theme', 'menu', 'loginLink']) - ]); ?> -
-
- $this->getData(['theme', 'menu', 'burgerTitle']), - 'help' => 'Le menu burger remplace le menu complet lorsque la largeur de l\'écran n\'est pas suffisante.' - ]); ?> -
-
-
-
-
@@ -168,4 +148,24 @@
+
+
+
+

Contenus

+
+
+ $this->getData(['theme', 'menu', 'loginLink']) + ]); ?> +
+
+ $this->getData(['theme', 'menu', 'burgerTitle']), + 'help' => 'Le menu burger remplace le menu complet lorsque la largeur de l\'écran n\'est pas suffisante.' + ]); ?> +
+
+
+
+