From 626b8c913e256f59e417d5bfd8b64187d0eae2b5 Mon Sep 17 00:00:00 2001 From: Pierre Date: Tue, 20 Oct 2020 01:55:08 +0200 Subject: [PATCH] relookage "insoumis" --- content/charte.html | 6 +++ content/sommaire.html | 2 +- css/_polices.scss | 18 ++++++- css/_sq_balint.scss | 12 ++--- css/_variables.scss | 9 ++-- css/mon_site.css | 101 +++++++++++++++++++++--------------- inclure/menu_principal.html | 5 +- 7 files changed, 96 insertions(+), 57 deletions(-) create mode 100644 content/charte.html diff --git a/content/charte.html b/content/charte.html new file mode 100644 index 0000000..cb0f859 --- /dev/null +++ b/content/charte.html @@ -0,0 +1,6 @@ +
+
+

Charte d'usage

+ Comment échanger entre nous de manière efficace et agréable. +
+
\ No newline at end of file diff --git a/content/sommaire.html b/content/sommaire.html index a6f0e71..be31883 100644 --- a/content/sommaire.html +++ b/content/sommaire.html @@ -17,7 +17,7 @@
-
+

Derniers articles

diff --git a/css/_polices.scss b/css/_polices.scss index b9d7e1b..94dde1a 100644 --- a/css/_polices.scss +++ b/css/_polices.scss @@ -19,7 +19,7 @@ src: url("../fonts/Poppins500i.woff2?#iefix") format("woff2"); font-weight: 500; font-style: italic; -}*/ +} @font-face { font-family: 'Cabin'; @@ -50,7 +50,7 @@ } -/* + @font-face { font-family: 'Bitter'; src: url("../fonts/bitter.woff2?#iefix") format("woff2"); @@ -72,3 +72,17 @@ font-style: normal; } */ + +@font-face { + font-family: 'Montserrat'; + src: url("../webfonts/montserrat-regular/montserrat-regular.woff2?#iefix") format("woff2"); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'Montserrat'; + src: url("../webfonts/montserrat-bold/montserrat-bold.woff2?#iefix") format("woff2"); + font-weight: 700; + font-style: normal; +} \ No newline at end of file diff --git a/css/_sq_balint.scss b/css/_sq_balint.scss index 8dec731..e50f65f 100644 --- a/css/_sq_balint.scss +++ b/css/_sq_balint.scss @@ -56,10 +56,10 @@ textarea[name="texte"]{ } /* polices */ -* { font-family: 'Cabin', sans-serif; font-size: 1.1rem} +* { font-family: 'Montserrat', sans-serif; font-size: 1.1rem} i.fas { font-family: fontawesome; font-style: normal; font-weight: 400; } h1, .h1, h2, .h2, h3, .h3, h4, .h4, legend, -.h1-like, .h2-like, .h3-like, .h4-like { font-family: 'Cabin', sans-serif; } +.h1-like, .h2-like, .h3-like, .h4-like { font-family: 'Montserrat', sans-serif; } /* liens */ @@ -99,7 +99,7 @@ img{ border-radius: 0.2rem; } strong{ cursor:initial; - color: $page-active; + color: $pagination-active; } .lien_pagination{ color: $light; @@ -141,8 +141,8 @@ body{ } .nav-link, .dropdown-item{ color: $texte-menu; - font-weight: 500; - font-family: 'Cabin', sans-serif; + font-weight: 400; + font-family: 'Montserrat', sans-serif; text-align: center; transition: height 1s ease; } @@ -311,7 +311,7 @@ body{ .dernieres-nouvelles{ text-align: left; padding: 0 1.2rem; - border-left: solid 1px $couleur-liens; + //border-left: solid 1px $couleur-liens; } .agenda-evenement{ diff --git a/css/_variables.scss b/css/_variables.scss index bf57f70..68e6f8f 100644 --- a/css/_variables.scss +++ b/css/_variables.scss @@ -3,15 +3,16 @@ $dark: #595959; //$fond-menu: #3b3f8a; bleu-violet plus foncé //$fond-menu: #478E7E; vert-bleu plus foncé $fond-menu: white; -$texte-menu: #3CAAFF; +$texte-menu: #00ADCB; //$couleur-liens : #dc7544; orange moins vif -$couleur-liens: #dd7f51; +$couleur-liens: #C84227; // $couleur-liens : #f67638; orange vif $gris-moyen : #7d7d7d; $gris-clair : #f2f2f2; $page-active-clair: #fff99d; -$page-active: #FF8C00; +$page-active: #C84227; +$pagination-active: #FF8A00; //$fond-footer: #464ba3; bleu-violet //$fond-footer: #4B9886; vert-bleu $fond-footer: $texte-menu; @@ -31,4 +32,4 @@ $bg-nous-contacter: url('../images/Fond-contact-vert.jpg'); $bg-diapo : rgba(255,255,255,0.55); // $bg-diapo-texte: rgba(0,13,158,0.65); // $bg-diapo-texte: #478E7E; vert-bleu -$bg-diapo-texte: #0c8d5c \ No newline at end of file +$bg-diapo-texte: #00ADCB \ No newline at end of file diff --git a/css/mon_site.css b/css/mon_site.css index 4c9cfdc..b3d8f68 100644 --- a/css/mon_site.css +++ b/css/mon_site.css @@ -11570,36 +11570,38 @@ a.text-dark:focus, a.text-dark:hover { src: url("../fonts/Poppins500i.woff2?#iefix") format("woff2"); font-weight: 500; font-style: italic; -}*/ -@font-face { - font-family: 'Cabin'; - src: url("../fonts/Cabin400.woff2?#iefix") format("woff2"); - font-weight: 400; - font-style: normal; } @font-face { - font-family: 'Cabin'; - src: url("../fonts/Cabin500.woff2?#iefix") format("woff2"); - font-weight: 500; - font-style: normal; + font-family: 'Cabin'; + src: url("../fonts/Cabin400.woff2?#iefix") format("woff2"); + font-weight: 400; + font-style: normal; } @font-face { - font-family: 'Cabin'; - src: url("../fonts/Cabin700.woff2?#iefix") format("woff2"); - font-weight: 700; - font-style: normal; + font-family: 'Cabin'; + src: url("../fonts/Cabin500.woff2?#iefix") format("woff2"); + font-weight: 500; + font-style: normal; } @font-face { - font-family: 'Cabin'; - src: url("../fonts/Cabin500i.woff2?#iefix") format("woff2"); - font-weight: 500; - font-style: italic; + font-family: 'Cabin'; + src: url("../fonts/Cabin700.woff2?#iefix") format("woff2"); + font-weight: 700; + font-style: normal; +} + +@font-face { + font-family: 'Cabin'; + src: url("../fonts/Cabin500i.woff2?#iefix") format("woff2"); + font-weight: 500; + font-style: italic; } -/* + + @font-face { font-family: 'Bitter'; src: url("../fonts/bitter.woff2?#iefix") format("woff2"); @@ -11621,6 +11623,20 @@ a.text-dark:focus, a.text-dark:hover { font-style: normal; } */ +@font-face { + font-family: 'Montserrat'; + src: url("../webfonts/montserrat-regular/montserrat-regular.woff2?#iefix") format("woff2"); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'Montserrat'; + src: url("../webfonts/montserrat-bold/montserrat-bold.woff2?#iefix") format("woff2"); + font-weight: 700; + font-style: normal; +} + /* ------------------------------------------ /* Habillage des formulaires SPIP /* ------------------------------------------ */ @@ -11911,7 +11927,7 @@ textarea[name="texte"] { .bordure-top { padding-top: 1.5rem; - border-top: solid 1px #dd7f51; + border-top: solid 1px #C84227; } .loading > * { @@ -11920,7 +11936,7 @@ textarea[name="texte"] { /* polices */ * { - font-family: 'Cabin', sans-serif; + font-family: 'Montserrat', sans-serif; font-size: 1.1rem; } @@ -11932,13 +11948,13 @@ i.fas { h1, .h1, h2, .h2, h3, .h3, h4, .h4, legend, .h1-like, .h2-like, .h3-like, .h4-like { - font-family: 'Cabin', sans-serif; + font-family: 'Montserrat', sans-serif; } /* liens */ a, a:hover { text-decoration: none; - color: #dd7f51; + color: #C84227; } /* images */ @@ -11967,14 +11983,14 @@ img { } .pagination strong, .pagination .lien_pagination { - background-color: #3CAAFF; + background-color: #00ADCB; padding: 0.5rem 1rem; border-radius: 0.2rem; } .pagination strong { cursor: initial; - color: #FF8C00; + color: #FF8A00; } .pagination .lien_pagination { @@ -12020,9 +12036,9 @@ body { } #menu-principal .nav-link, #menu-principal .dropdown-item { - color: #3CAAFF; - font-weight: 500; - font-family: 'Cabin', sans-serif; + color: #00ADCB; + font-weight: 400; + font-family: 'Montserrat', sans-serif; text-align: center; -webkit-transition: height 1s ease; transition: height 1s ease; @@ -12040,7 +12056,7 @@ body { } #menu-principal .active a.nav-link { - color: #FF8C00; + color: #C84227; } #menu-principal .navbar-toggler { @@ -12187,7 +12203,7 @@ body { } .a-la-une { - color: #0c8d5c; + color: #00ADCB; } #agenda, .dernieres-nouvelles { @@ -12204,7 +12220,7 @@ body { #agenda .h3, .dernieres-nouvelles .h3 { font-weight: 700; margin: 1.5rem; - color: #0c8d5c; + color: #00ADCB; } #agenda .h5, .dernieres-nouvelles .h5 { @@ -12214,7 +12230,6 @@ body { .dernieres-nouvelles { text-align: left; padding: 0 1.2rem; - border-left: solid 1px #dd7f51; } .agenda-evenement { @@ -12281,7 +12296,7 @@ body { } .bloc-ville:hover div { - color: #dd7f51; + color: #C84227; } #nous-contacter { @@ -12349,7 +12364,7 @@ body { } .diapo-texte { - background-color: #0c8d5c; + background-color: #00ADCB; padding: 2rem; align-self: center; width: 70%; @@ -12357,7 +12372,7 @@ body { } .diapo-bouton { - background-color: #0c8d5c; + background-color: #00ADCB; border: solid 2px white; border-radius: 0.2rem; padding: 0.5rem 2rem; @@ -12403,7 +12418,7 @@ body { /***************************** FOOTER *********************************/ /**********************************************************************/ #footer-infos { - background: #3CAAFF; + background: #00ADCB; padding: 3rem 0; } @@ -12429,7 +12444,7 @@ body { } .footer .footer-options { - background: #3CAAFF; + background: #00ADCB; padding: 0 0 2rem 0; } @@ -12524,7 +12539,7 @@ body { /************************ PAGE ASSOCIATION ****************************/ /**********************************************************************/ #menu-association, #menu-methode, #menu-groupes, #menu-medias, #menu-espace_membre { - background: #dd7f51; + background: #C84227; margin: 1rem 0; border-radius: 0.2rem; padding: 0; @@ -12619,7 +12634,7 @@ body { .articles-groupe { display: inline-block; padding: 1rem; - background: #dd7f51; + background: #C84227; border-radius: 0.5rem 0.5rem 0 0; color: white; } @@ -12667,7 +12682,7 @@ body { } .formulaire_spip .boutons .submit, .formulaire_spip .boutons .btn_editer, .boutons .submit, .boutons .btn_editer { - background-color: #3CAAFF; + background-color: #00ADCB; color: #f8f9fa; padding: 1rem; line-height: 1rem; @@ -12684,14 +12699,14 @@ body { } .btn.bouton-login { - background: #dd7f51; + background: #C84227; border-radius: 0.2rem; color: #333 !important; } .btn.bouton-login:hover { color: black; - background-color: #FF8C00; + background-color: #C84227; } .bouton-toggle { @@ -12944,7 +12959,7 @@ body { } #page-contact .formulaire_nous_contacter input.submit { - background-color: #3CAAFF; + background-color: #00ADCB; color: #f8f9fa; padding: 1rem; line-height: 1rem; diff --git a/inclure/menu_principal.html b/inclure/menu_principal.html index 6e992d2..2ea9192 100644 --- a/inclure/menu_principal.html +++ b/inclure/menu_principal.html @@ -7,7 +7,7 @@