From d64edb92ac688f6cc36c166f4d557e74faf2d6bb Mon Sep 17 00:00:00 2001
From: chankalan <chankalan@choc0.net>
Date: Wed, 16 Sep 2020 15:33:54 +0200
Subject: [PATCH] =?UTF-8?q?styles=20g=C3=A9n=C3=A9riques=20revus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 paquet.xml                          | 2 +-
 squelettes/scss/base/_main.scss     | 2 +-
 squelettes/scss/base/_typo.scss     | 4 +++-
 squelettes/scss/styles/_layout.scss | 2 +-
 squelettes/scss/styles/_nav.scss    | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/paquet.xml b/paquet.xml
index 0cb41e0..8d52d3c 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -9,7 +9,7 @@
 	documentation=""
 >
 
-	<nom>baz_april</nom>
+	<nom>APRIL : base mutualisée des sites SPIP</nom>
 	<auteur>chankalan</auteur>
 	<auteur>Nicolas Dorigny</auteur>
 	
diff --git a/squelettes/scss/base/_main.scss b/squelettes/scss/base/_main.scss
index bd860e7..803008d 100755
--- a/squelettes/scss/base/_main.scss
+++ b/squelettes/scss/base/_main.scss
@@ -27,7 +27,7 @@ h5, .h5,
 h6, .h6 {
     font-size:   100%;
     font-style:  normal;
-    font-weight: bold;
+    font-weight: 400;
     line-height: 1.2;
     padding:     0;
     margin:      0 0 0.8em 0;
diff --git a/squelettes/scss/base/_typo.scss b/squelettes/scss/base/_typo.scss
index 5681e20..89e2acd 100644
--- a/squelettes/scss/base/_typo.scss
+++ b/squelettes/scss/base/_typo.scss
@@ -1,6 +1,8 @@
 /* font */
 @include font-face(Fontawesome, fontawesome);
 
+@include font-face(Merriweather, merriweather-light-webfont, 200, normal);
+@include font-face(Merriweather, merriweather-lightitalic-webfont, 200, italic);
 @include font-face(Merriweather, merriweather-regular-webfont, 400, normal);
 @include font-face(Merriweather, merriweather-regularitalic-webfont, 400, italic);
 @include font-face(Merriweather, merriweather-bold-webfont, 700, normal);
@@ -97,7 +99,7 @@ h6, .h6 {
     margin:         0 0 0.8em 0;
     letter-spacing: 0.02em;
     a:link, a:visited {
-        color: $couleur-titres;
+        /*color: $couleur-titres;*/
     }
     a:hover {
         color: $couleur-lien-hover;
diff --git a/squelettes/scss/styles/_layout.scss b/squelettes/scss/styles/_layout.scss
index 92cd5fd..758dcc0 100644
--- a/squelettes/scss/styles/_layout.scss
+++ b/squelettes/scss/styles/_layout.scss
@@ -32,7 +32,7 @@ html, body {
 
 .page_header,
 .page_main {
-    margin-bottom: 2em;
+/*     margin-bottom: 2em; */
 }
 
 // initiatives
diff --git a/squelettes/scss/styles/_nav.scss b/squelettes/scss/styles/_nav.scss
index bf8ed63..00078a9 100644
--- a/squelettes/scss/styles/_nav.scss
+++ b/squelettes/scss/styles/_nav.scss
@@ -81,7 +81,7 @@
 .page_header > .page_container {
 	 .nav {
 		padding-top:$spacer;
-		font-size:0.9rem;
+		font-size:0.95rem;
 		z-index:9;
 		> ul { 
 			text-align:right;