diff --git a/content/article.html b/content/article.html index b5a2133..939f1ce 100644 --- a/content/article.html +++ b/content/article.html @@ -13,30 +13,48 @@ ] -

#TITRE

+
+ +
+

#TITRE

+ [

(#SOUSTITRE)

] +
+ +
#TEXTE
+ + +
+ [(#REM) afficher mots-clés et tags dont le groupe est "important" ] + + + #TITRE + + +
+ -
-
- [

(#SOUSTITRE)

] - - [(#FICHIER|image_recadre{900:450,-,focus}|image_reduire{900,450})] - -
#TEXTE
- -
- [(#REM) afficher mots-clés et tags dont le groupe est "important" ] - - - #TITRE - -
- - - - [(#FICHIER|image_recadre{350:200,-,focus}|image_reduire{350, 200})] - +
+ +
+ +
+ +
+ + [(#CHEMIN{img/document.png}|balise_img{#TITRE}|image_reduire{0,120})] + [
(#TITRE)
] + +
+ +
+ + + + [(#FICHIER|balise_img{#TITRE}|image_recadre{540:270,-,focus}|image_reduire{540, 270})] + [
(#TITRE)
] +
diff --git a/content/groupe.html b/content/groupe.html index 7f34132..53e8491 100644 --- a/content/groupe.html +++ b/content/groupe.html @@ -9,7 +9,7 @@ -

Groupes de #GET{ville}

+

Groupes de #GET{ville}

@@ -19,12 +19,20 @@
[(#AUTORISER{modifier, article, #ID_ARTICLE}) - Mettre à jour le groupe + Mettre à jour le groupe ] [

(#TITRE)

]
#SOUSTITRE
#DESCRIPTIF
#TEXTE
+ +

Responsables

+ +
#NOM
+
#EMAIL
+
#TELEPHONE
+ [
(#TELEPHONE2)
] + diff --git a/content/sommaire.html b/content/sommaire.html index 57b9408..f14beef 100644 --- a/content/sommaire.html +++ b/content/sommaire.html @@ -33,11 +33,9 @@

Agenda

-

- - #TITRE - -

+ +

#TITRE

+ #DATE_AGENDA
@@ -67,7 +65,7 @@

Nous contacter

- +
#FORMULAIRE_NOUS_CONTACTER{#ID_AUTEUR}
@@ -75,7 +73,7 @@
- [(#FICHIER|image_recadre{510:420,-,focus}|image_reduire{510,420})] + [(#FICHIER|balise_img{Jardin du Luxembourg peint par Henri Rousseau}|image_recadre{510:420,-,focus}|image_reduire{510,420})]
diff --git a/css/_sq_balint.scss b/css/_sq_balint.scss index 1f4a492..dfde9d2 100644 --- a/css/_sq_balint.scss +++ b/css/_sq_balint.scss @@ -14,13 +14,11 @@ opacity: 1 !important; } - - /* polices */ -* { font-family: 'Open Sans', sans-serif; } +* { font-family: 'Cabin', 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: 'Open Sans', sans-serif; } +.h1-like, .h2-like, .h3-like, .h4-like { font-family: 'Cabin', sans-serif; } /* liens */ @@ -35,6 +33,14 @@ img{ height: auto; } +/* breadcrumb */ +.breadcrumb{ + background: $fond-formulaires; + .divider{ + padding: 0 0.2rem; + } +} + /* body */ body{ background: $bg-body; @@ -59,7 +65,9 @@ body{ transition: all 1s; .nav-link{ color: $light; - font-weight: 600; + font-weight: 500; + font-family: 'Cabin', sans-serif; + font-size: 1.2rem; transition: all 1s ease; } .navbar-brand{ @@ -129,8 +137,13 @@ body{ border-radius: 0.2rem; font-weight: 500; .intro{ - font-size: 1.2rem; - line-height: 1.4rem; + font-size: 1.3rem; + line-height: 1.5rem; + font-weight:400; + strong{ + font-size: 1.3rem; + font-weight: 700; + } } } } @@ -418,7 +431,7 @@ body{ width: 100%; min-height: 100%; border: solid 1px #ddd; - background: white; + background: $fond-formulaires; border-radius: 0.2rem; padding: 1.5rem; text-align: center; @@ -501,7 +514,7 @@ body{ } } } - .photo_article { + .docs-article { justify-content: left; display: flex; .une_photo { @@ -525,8 +538,10 @@ body{ .boutons_actions { width: 100%; display: flex; + flex-direction: column; justify-content: space-around; - background-color: #e0e0e0; + align-items: center; + background-color: $gris-clair; i.green { padding: .6rem; color: rgb(28, 158, 28); @@ -538,6 +553,7 @@ body{ display: flex; flex-direction: row; align-items: center; + padding: 0.2rem; } } } @@ -546,6 +562,12 @@ body{ } } +.titre_img{ + background: $gris-moyen; + color: white; + text-align: center; +} + .photo-premier-plan{ margin-bottom: 1.5rem; border: solid 1px #BBB; @@ -562,6 +584,33 @@ body{ } } +/**********************************************************************/ +/**************************** PAGE ARTICLE ****************************/ +/**********************************************************************/ +.contenu-article{ + background: $fond-formulaires; + border-radius: 0.5rem; + padding: 1.5rem; +} + +.liste-documents{ + justify-content: center; + text-align: center; + margin-bottom: 1.5rem;; + .col{ + flex: 0 0 10rem; + } + .titre_img{ + font-size: 1rem; + background: none; + color: $dark; + } +} + +.photo-article{ + margin-bottom: 1.5rem;; +} + /**********************************************************************/ /****************************** spip_admin ****************************/ /**********************************************************************/ diff --git a/css/_variables.scss b/css/_variables.scss index a823984..14fdd8a 100644 --- a/css/_variables.scss +++ b/css/_variables.scss @@ -2,6 +2,8 @@ $couleur-texte : black; $dark: #595959; $fond-menu: #3b3f8a; $couleur-liens : #dc7544; +$gris-moyen : #7d7d7d; +$gris-clair : #f2f2f2; //$page-active: #ffe9aa; $page-active: #ffdb70; $fond-footer: #464ba3; diff --git a/css/mon_site.css b/css/mon_site.css index 0d0a188..731e223 100644 --- a/css/mon_site.css +++ b/css/mon_site.css @@ -11551,21 +11551,62 @@ a.text-dark:focus, a.text-dark:hover { } /* les polices à charger en @font-face */ +/*@font-face { + font-family: 'Poppins'; + src: url("../fonts/Poppins400.woff2?#iefix") format("woff2"); + font-weight: 400; + font-style: normal; +} + @font-face { - font-family: 'Lato'; - src: url("../fonts/lato_regular.woff2?#iefix") format("woff2"); - font-weight: normal; + font-family: 'Poppins'; + src: url("../fonts/Poppins700.woff2?#iefix") format("woff2"); + font-weight: 700; + font-style: normal; +} + +@font-face { + font-family: 'Poppins'; + 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: 'Bitter'; - src: url("../fonts/bitter.woff2?#iefix") format("woff2"); - font-weight: 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/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"); + font-weight: normal; + font-style: normal; +} + @font-face { font-family: 'luxi_sansregular'; src: url("../fonts/luxisr-webfont.woff?#iefix") format("woff"); @@ -11838,7 +11879,8 @@ fieldset.reponse_formulaire { /* polices */ * { - font-family: 'Open Sans', sans-serif; + font-family: 'Cabin', sans-serif; + font-size: 1.1rem; } i.fas { @@ -11849,7 +11891,7 @@ i.fas { h1, .h1, h2, .h2, h3, .h3, h4, .h4, legend, .h1-like, .h2-like, .h3-like, .h4-like { - font-family: 'Open Sans', sans-serif; + font-family: 'Cabin', sans-serif; } /* liens */ @@ -11864,6 +11906,15 @@ img { height: auto; } +/* breadcrumb */ +.breadcrumb { + background: rgba(255, 255, 255, 0.8); +} + +.breadcrumb .divider { + padding: 0 0.2rem; +} + /* body */ body { background: url("../images/bg-web.jpg"); @@ -11889,7 +11940,9 @@ body { #menu-principal .nav-link { color: #f8f9fa; - font-weight: 600; + font-weight: 500; + font-family: 'Cabin', sans-serif; + font-size: 1.2rem; -webkit-transition: all 1s ease; transition: all 1s ease; } @@ -11973,8 +12026,14 @@ body { } #texte-presentation .contenu .intro { - font-size: 1.2rem; - line-height: 1.4rem; + font-size: 1.3rem; + line-height: 1.5rem; + font-weight: 400; +} + +#texte-presentation .contenu .intro strong { + font-size: 1.3rem; + font-weight: 700; } #mis-en-avant { @@ -12318,7 +12377,7 @@ body { width: 100%; min-height: 100%; border: solid 1px #ddd; - background: white; + background: rgba(255, 255, 255, 0.8); border-radius: 0.2rem; padding: 1.5rem; text-align: center; @@ -12424,14 +12483,14 @@ body { } } -.formulaire_editer_post .photo_article { +.formulaire_editer_post .docs-article { -webkit-box-pack: left; justify-content: left; display: -webkit-box; display: flex; } -.formulaire_editer_post .photo_article .une_photo { +.formulaire_editer_post .docs-article .une_photo { margin-right: 1rem; display: -webkit-box; display: flex; @@ -12441,40 +12500,45 @@ body { max-width: 320px; } -.formulaire_editer_post .photo_article .btn_poubelle { +.formulaire_editer_post .docs-article .btn_poubelle { color: red; } -.formulaire_editer_post .photo_article .btn_poubelle :hover { +.formulaire_editer_post .docs-article .btn_poubelle :hover { color: #ee9e9e; } -.formulaire_editer_post .photo_article .btn_une { +.formulaire_editer_post .docs-article .btn_une { color: black; } -.formulaire_editer_post .photo_article .btn_une :hover { +.formulaire_editer_post .docs-article .btn_une :hover { color: grey; } -.formulaire_editer_post .photo_article .boutons_actions { +.formulaire_editer_post .docs-article .boutons_actions { width: 100%; display: -webkit-box; display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + flex-direction: column; justify-content: space-around; - background-color: #e0e0e0; + -webkit-box-align: center; + align-items: center; + background-color: #f2f2f2; } -.formulaire_editer_post .photo_article .boutons_actions i.green { +.formulaire_editer_post .docs-article .boutons_actions i.green { padding: .6rem; color: #1c9e1c; } -.formulaire_editer_post .photo_article .boutons_actions a { +.formulaire_editer_post .docs-article .boutons_actions a { margin: 0; } -.formulaire_editer_post .photo_article .boutons_actions .premier-plan { +.formulaire_editer_post .docs-article .boutons_actions .premier-plan { display: -webkit-box; display: flex; -webkit-box-orient: horizontal; @@ -12482,12 +12546,19 @@ body { flex-direction: row; -webkit-box-align: center; align-items: center; + padding: 0.2rem; } .formulaire_editer_post legend { width: auto; } +.titre_img { + background: #7d7d7d; + color: white; + text-align: center; +} + .photo-premier-plan { margin-bottom: 1.5rem; border: solid 1px #BBB; @@ -12505,6 +12576,37 @@ body { margin-bottom: 1.2rem; } +/**********************************************************************/ +/**************************** PAGE ARTICLE ****************************/ +/**********************************************************************/ +.contenu-article { + background: rgba(255, 255, 255, 0.8); + border-radius: 0.5rem; + padding: 1.5rem; +} + +.liste-documents { + -webkit-box-pack: center; + justify-content: center; + text-align: center; + margin-bottom: 1.5rem; +} + +.liste-documents .col { + -webkit-box-flex: 0; + flex: 0 0 10rem; +} + +.liste-documents .titre_img { + font-size: 1rem; + background: none; + color: #595959; +} + +.photo-article { + margin-bottom: 1.5rem; +} + /**********************************************************************/ /****************************** spip_admin ****************************/ /**********************************************************************/ diff --git a/formulaires/editer_post.html b/formulaires/editer_post.html index 1928594..9c424fa 100644 --- a/formulaires/editer_post.html +++ b/formulaires/editer_post.html @@ -76,12 +76,12 @@
- Photos + Images et PDF
- +
[(#REM) diff --git a/formulaires/editer_post.php b/formulaires/editer_post.php index 391ad08..99e3251 100644 --- a/formulaires/editer_post.php +++ b/formulaires/editer_post.php @@ -97,7 +97,7 @@ function formulaires_editer_post_verifier_dist($id_article=0, $redirect=''){ $bigform = charger_fonction('bigform_verifier','inc'); - $options = ['mime' => 'image_web','taille_max'=>'2000','largeur_max'=>'2048','hauteur_max'=>'2048']; + $options = ['mime' => 'tout_mime','taille_max'=>'5000','largeur_max'=>'2048','hauteur_max'=>'2048']; $bigform($options,$erreurs); return $erreurs; diff --git a/img/document.png b/img/document.png new file mode 100644 index 0000000..714c3a0 Binary files /dev/null and b/img/document.png differ diff --git a/img/sprite_symbol_pictos.svg b/img/sprite_symbol_pictos.svg index 39e462d..a8be7af 100644 --- a/img/sprite_symbol_pictos.svg +++ b/img/sprite_symbol_pictos.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/inclure/photos_article.html b/inclure/editer_docs_article.html similarity index 53% rename from inclure/photos_article.html rename to inclure/editer_docs_article.html index 062bb48..521cd30 100644 --- a/inclure/photos_article.html +++ b/inclure/editer_docs_article.html @@ -1,26 +1,37 @@ #CACHE{0} [(#ENV{id_article}|=={0}|oui) [(#SESSION{id_auteur}|mult{-1}|setenv{id_article})] ] -
- -
- [(#FICHIER|image_recadre{320:180,-,focus}|image_reduire{320,180})] +
+ +
+
+ [(#TYPE_DOCUMENT|in_array{#LISTE{JPEG,PNG,GIF}}|?{ + [(#FICHIER|image_recadre{320:180,-,focus}|image_reduire{320,180})], + [(#CHEMIN{img/document.png}|image_recadre{320:180,+,center}|image_reduire{320,180})] + } + )] - [(#SESSION{statut}|=={0minirezo}|oui) + [
(#TITRE|sinon{[(#SESSION{statut}|=={0minirezo}|oui)Double cliquez pour ajouter un titre]})
] +
- - - +
+ [(#TYPE_DOCUMENT|in_array{#LISTE{JPEG,PNG,GIF}}|oui) [(#CREDITS*|=={une}|?{ -
Au premier plan
+ Au premier plan , Mettre au premier plan })] + ] +
+ + Supprimer + +
- ] - [
(#TITRE|sinon{[(#SESSION{statut}|=={0minirezo}|oui)Double cliquez pour ajouter un titre]})
] +
+
diff --git a/inclure/photo_article.html b/inclure/photo_article.html index 493c401..81adc19 100644 --- a/inclure/photo_article.html +++ b/inclure/photo_article.html @@ -2,11 +2,11 @@ [(#ENV{id_article}|=={0}|oui) [(#SESSION{id_auteur}|mult{-1}|setenv{id_article})] ]
- [(#FICHIER|image_recadre{720:360,-,focus}|image_reduire{720,360})] + [(#FICHIER|balise_img{#TITRE}|image_recadre{720:360,-,focus}|image_reduire{720,360})]
- [(#FICHIER|image_recadre{720:360,+,center}|image_reduire{720,360})] + [(#FICHIER|balise_img{#TITRE}|image_recadre{720:360,+,center}|image_reduire{720,360})]
diff --git a/svg/document.svg b/svg/document.svg new file mode 100644 index 0000000..fa9760d --- /dev/null +++ b/svg/document.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + +