ajout Fira Sans, amelioration du blueprint

22 files changed, 146 insertions, 14 deletions

diff --git a/assets/css/deuxfleurs.css b/assets/css/blueprint.css
index 1908767..f3e98ee 100644
--- a/assets/css/deuxfleurs.css
+++ b/assets/css/blueprint.css
@@ -1,12 +1,17 @@
 @charset "UTF-8";
 
 @import url("../fonts/spacemono.css");
+@import url("../fonts/firasans-regular.css");
 
 html, body {
 	background-color:  white;
 	font-family: "Space Mono", Monaco, monospace !important;
 }
 
+p {
+	font-family: "Fira Sans";
+}
+
 header {
     background-image: url("../images/ronce/illustration-ronce_1200x765px.png");
     height: 100vh;
@@ -35,4 +40,13 @@ header > p {
 nav {
 	position:  fixed;
 
+}
+
+
+
+
+footer {
+	border-top: black solid 2px;
+	margin-top: 3rem;
+	padding-top:  2rem;
 }
\ No newline at end of file
diff --git a/assets/fonts/firasans-regular.css b/assets/fonts/firasans-regular.css
new file mode 100644
index 0000000..5602ad4
--- /dev/null
+++ b/assets/fonts/firasans-regular.css
@@ -0,0 +1,24 @@
+@font-face {
+    font-family: 'Fira Sans';
+    src: url('../fonts/spacemono/FiraSans-BoldItalic.ttf') format('truetype');
+    font-weight: bold;
+    font-style: italic;
+}
+@font-face {
+    font-family: 'Fira Sans';
+    src: url('../fonts/spacemono/FiraSans-Bold.ttf') format('truetype');
+    font-weight: bold;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Fira Sans';
+    src: url('../fonts/spacemono/FiraSans-Italic.ttf') format('truetype');
+    font-weight: normal;
+    font-style: italic;
+}
+@font-face {
+    font-family: 'Fira Sans';
+    src: url('../fonts/spacemono/FiraSans-Regular.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+}
\ No newline at end of file
diff --git a/assets/fonts/firasans/FiraSans-Black.ttf b/assets/fonts/firasans/FiraSans-Black.ttf
new file mode 100644
index 0000000..3087a31
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-Black.ttf
diff --git a/assets/fonts/firasans/FiraSans-BlackItalic.ttf b/assets/fonts/firasans/FiraSans-BlackItalic.ttf
new file mode 100644
index 0000000..9a9ef5e
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-BlackItalic.ttf
diff --git a/assets/fonts/firasans/FiraSans-Bold.ttf b/assets/fonts/firasans/FiraSans-Bold.ttf
new file mode 100644
index 0000000..0fb896a
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-Bold.ttf
diff --git a/assets/fonts/firasans/FiraSans-BoldItalic.ttf b/assets/fonts/firasans/FiraSans-BoldItalic.ttf
new file mode 100644
index 0000000..e7e936f
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-BoldItalic.ttf
diff --git a/assets/fonts/firasans/FiraSans-ExtraBold.ttf b/assets/fonts/firasans/FiraSans-ExtraBold.ttf
new file mode 100644
index 0000000..4b29d6f
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-ExtraBold.ttf
diff --git a/assets/fonts/firasans/FiraSans-ExtraBoldItalic.ttf b/assets/fonts/firasans/FiraSans-ExtraBoldItalic.ttf
new file mode 100644
index 0000000..de3b83b
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-ExtraBoldItalic.ttf
diff --git a/assets/fonts/firasans/FiraSans-ExtraLight.ttf b/assets/fonts/firasans/FiraSans-ExtraLight.ttf
new file mode 100644
index 0000000..e5755da
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-ExtraLight.ttf
diff --git a/assets/fonts/firasans/FiraSans-ExtraLightItalic.ttf b/assets/fonts/firasans/FiraSans-ExtraLightItalic.ttf
new file mode 100644
index 0000000..890524e
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-ExtraLightItalic.ttf
diff --git a/assets/fonts/firasans/FiraSans-Italic.ttf b/assets/fonts/firasans/FiraSans-Italic.ttf
new file mode 100644
index 0000000..36efca2
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-Italic.ttf
diff --git a/assets/fonts/firasans/FiraSans-Light.ttf b/assets/fonts/firasans/FiraSans-Light.ttf
new file mode 100644
index 0000000..fac4edf
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-Light.ttf
diff --git a/assets/fonts/firasans/FiraSans-LightItalic.ttf b/assets/fonts/firasans/FiraSans-LightItalic.ttf
new file mode 100644
index 0000000..1daa0bc
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-LightItalic.ttf
diff --git a/assets/fonts/firasans/FiraSans-Medium.ttf b/assets/fonts/firasans/FiraSans-Medium.ttf
new file mode 100644
index 0000000..eeb8f8f
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-Medium.ttf
diff --git a/assets/fonts/firasans/FiraSans-MediumItalic.ttf b/assets/fonts/firasans/FiraSans-MediumItalic.ttf
new file mode 100644
index 0000000..328b53b
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-MediumItalic.ttf
diff --git a/assets/fonts/firasans/FiraSans-Regular.ttf b/assets/fonts/firasans/FiraSans-Regular.ttf
new file mode 100644
index 0000000..c4cfa59
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-Regular.ttf
diff --git a/assets/fonts/firasans/FiraSans-SemiBold.ttf b/assets/fonts/firasans/FiraSans-SemiBold.ttf
new file mode 100644
index 0000000..954a2ca
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-SemiBold.ttf
diff --git a/assets/fonts/firasans/FiraSans-SemiBoldItalic.ttf b/assets/fonts/firasans/FiraSans-SemiBoldItalic.ttf
new file mode 100644
index 0000000..55e812c
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-SemiBoldItalic.ttf
diff --git a/assets/fonts/firasans/FiraSans-Thin.ttf b/assets/fonts/firasans/FiraSans-Thin.ttf
new file mode 100644
index 0000000..8cb4bad
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-Thin.ttf
diff --git a/assets/fonts/firasans/FiraSans-ThinItalic.ttf b/assets/fonts/firasans/FiraSans-ThinItalic.ttf
new file mode 100644
index 0000000..f2dbf59
--- /dev/null
+++ b/assets/fonts/firasans/FiraSans-ThinItalic.ttf
diff --git a/assets/fonts/firasans/OFL.txt b/assets/fonts/firasans/OFL.txt
new file mode 100644
index 0000000..53aea66
--- /dev/null
+++ b/assets/fonts/firasans/OFL.txt
@@ -0,0 +1,93 @@
+Copyright (c) 2012-2015, The Mozilla Foundation and Telefonica S.A.

+

+This Font Software is licensed under the SIL Open Font License, Version 1.1.

+This license is copied below, and is also available with a FAQ at:

+http://scripts.sil.org/OFL

+

+

+-----------------------------------------------------------

+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007

+-----------------------------------------------------------

+

+PREAMBLE

+The goals of the Open Font License (OFL) are to stimulate worldwide

+development of collaborative font projects, to support the font creation

+efforts of academic and linguistic communities, and to provide a free and

+open framework in which fonts may be shared and improved in partnership

+with others.

+

+The OFL allows the licensed fonts to be used, studied, modified and

+redistributed freely as long as they are not sold by themselves. The

+fonts, including any derivative works, can be bundled, embedded, 

+redistributed and/or sold with any software provided that any reserved

+names are not used by derivative works. The fonts and derivatives,

+however, cannot be released under any other type of license. The

+requirement for fonts to remain under this license does not apply

+to any document created using the fonts or their derivatives.

+

+DEFINITIONS

+"Font Software" refers to the set of files released by the Copyright

+Holder(s) under this license and clearly marked as such. This may

+include source files, build scripts and documentation.

+

+"Reserved Font Name" refers to any names specified as such after the

+copyright statement(s).

+

+"Original Version" refers to the collection of Font Software components as

+distributed by the Copyright Holder(s).

+

+"Modified Version" refers to any derivative made by adding to, deleting,

+or substituting -- in part or in whole -- any of the components of the

+Original Version, by changing formats or by porting the Font Software to a

+new environment.

+

+"Author" refers to any designer, engineer, programmer, technical

+writer or other person who contributed to the Font Software.

+

+PERMISSION & CONDITIONS

+Permission is hereby granted, free of charge, to any person obtaining

+a copy of the Font Software, to use, study, copy, merge, embed, modify,

+redistribute, and sell modified and unmodified copies of the Font

+Software, subject to the following conditions:

+

+1) Neither the Font Software nor any of its individual components,

+in Original or Modified Versions, may be sold by itself.

+

+2) Original or Modified Versions of the Font Software may be bundled,

+redistributed and/or sold with any software, provided that each copy

+contains the above copyright notice and this license. These can be

+included either as stand-alone text files, human-readable headers or

+in the appropriate machine-readable metadata fields within text or

+binary files as long as those fields can be easily viewed by the user.

+

+3) No Modified Version of the Font Software may use the Reserved Font

+Name(s) unless explicit written permission is granted by the corresponding

+Copyright Holder. This restriction only applies to the primary font name as

+presented to the users.

+

+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font

+Software shall not be used to promote, endorse or advertise any

+Modified Version, except to acknowledge the contribution(s) of the

+Copyright Holder(s) and the Author(s) or with their explicit written

+permission.

+

+5) The Font Software, modified or unmodified, in part or in whole,

+must be distributed entirely under this license, and must not be

+distributed under any other license. The requirement for fonts to

+remain under this license does not apply to any document created

+using the Font Software.

+

+TERMINATION

+This license becomes null and void if any of the above conditions are

+not met.

+

+DISCLAIMER

+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE

+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL

+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM

+OTHER DEALINGS IN THE FONT SOFTWARE.

diff --git a/blueprint/index.html b/blueprint/index.html
index 983536f..3ba8ec7 100644
--- a/blueprint/index.html
+++ b/blueprint/index.html
@@ -9,8 +9,8 @@
   <title>Deuxfleurs</title>
 
   <link rel="stylesheet" href="assets/css/normalize.css">
-  <link rel="stylesheet" href="assets/css/deuxfleurs.css">
   <link rel="stylesheet" href="assets/css/chota.min.css">
+  <link rel="stylesheet" href="assets/css/blueprint.css">
 </head>
 
 <body>
@@ -43,7 +43,7 @@
     </p>
   </header>
 
-  <main>
+  <main class="container">
     <section>
       <h2>Nos services</h2>
       <p>
@@ -77,8 +77,8 @@
         Nous pensons qu'une personne souhaitant rejoindre un hébergeur indépendant a besoin d'un accompagnement. D'abord parce que nos logiciels sont inhabituels et différents, ensuite parce que nous souhaitons garder le dialogue et si possible vous donner la possibilité de prendre part à nos choix. C'est pourquoi les inscriptions se font par cooptation.
       </p>
 
-      <div id="niveaux">
-        <section>
+      <div id="niveaux" class="row">
+        <section class="col">
           <h3>Ami⋅e</h3>
 
           <p>
@@ -88,7 +88,7 @@
           </p>
         </section>
 
-        <section>
+        <section class="col">
           <h3>Membre</h3>
 
           <p>
@@ -96,7 +96,7 @@
           </p>
         </section>
 
-        <section>
+        <section class="col">
           <h3>Hébergeur⋅euse</h3>
 
           <p>
@@ -107,8 +107,8 @@
         </section>
       </div>
 
-      <div id="trombinoscope">
-        <figure>
+      <div id="trombinoscope" class="row">
+        <figure class="col-6 col-3-md">
           <img src="">
           <figcaption>
             <h4>Esther</h4>
@@ -116,7 +116,7 @@
           </figcaption>
         </figure>
 
-        <figure>
+        <figure class="col-6 col-3-md">
           <img src="">
           <figcaption>
             <h4>Quentin</h4>
@@ -124,7 +124,7 @@
           </figcaption>
         </figure>
 
-        <figure>
+        <figure class="col-6 col-3-md">
           <img src="">
           <figcaption>
             <h4>Adrien</h4>
@@ -132,7 +132,7 @@
           </figcaption>
         </figure>
 
-        <figure>
+        <figure class="col-6 col-3-md">
           <img src="">
           <figcaption>
             <h4>Maximilien</h4>
@@ -140,7 +140,7 @@
           </figcaption>
         </figure>
 
-        <figure>
+        <figure class="col-6 col-3-md">
           <img src="">
           <figcaption>
             <h4>Alex</h4>
@@ -149,13 +149,14 @@
         </figure>
       </div>
     </section>
-  </main>
+
 
   <footer>
     <p>Brodé avec amour par Deuxfleurs.</p>
 
-    <p>Il y a sans doute un copyright.</p>
+    <p class="is-right">Il y a sans doute un copyright.</p>
   </footer>
+  </main>
 </body>
 
 </html>
\ No newline at end of file