aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorabesnard2015-02-15 18:35:56 +0100
committerabesnard2015-02-15 18:36:57 +0100
commit8ef9acbe7af6fe605fd243f0012af8486fd0899e (patch)
tree190e34d4c0f8020c5b51a1afc8ebebd9a4ac35ac
parent056f5c75f1abf4ef196418834145e5f140d32796 (diff)
downloadmakeup-8ef9acbe7af6fe605fd243f0012af8486fd0899e.tar.gz
makeup-8ef9acbe7af6fe605fd243f0012af8486fd0899e.tar.bz2
makeup-8ef9acbe7af6fe605fd243f0012af8486fd0899e.zip
Modification des polices, ajout de la rubrique yeux.
-rw-r--r--Fonts/NothingYouCouldSay.ttf (renamed from NothingYouCouldSay.ttf)bin65160 -> 65160 bytes
-rw-r--r--Fonts/pacifico.ttf (renamed from pacifico.ttf)bin75568 -> 75568 bytes
-rw-r--r--Images/yeux.jpgbin0 -> 72642 bytes
-rw-r--r--Pages/yeux.md12
-rw-r--r--Pages/yeux/A33
-rw-r--r--Pages/yeux/A.md33
-rw-r--r--font.css9
-rw-r--r--index.html5
-rw-r--r--menu.css7
-rw-r--r--style.css5
10 files changed, 91 insertions, 13 deletions
diff --git a/NothingYouCouldSay.ttf b/Fonts/NothingYouCouldSay.ttf
index 93a6316..93a6316 100644
--- a/NothingYouCouldSay.ttf
+++ b/Fonts/NothingYouCouldSay.ttf
Binary files differ
diff --git a/pacifico.ttf b/Fonts/pacifico.ttf
index 6d47cdc..6d47cdc 100644
--- a/pacifico.ttf
+++ b/Fonts/pacifico.ttf
Binary files differ
diff --git a/Images/yeux.jpg b/Images/yeux.jpg
new file mode 100644
index 0000000..9a33d1e
--- /dev/null
+++ b/Images/yeux.jpg
Binary files differ
diff --git a/Pages/yeux.md b/Pages/yeux.md
new file mode 100644
index 0000000..2dd8837
--- /dev/null
+++ b/Pages/yeux.md
@@ -0,0 +1,12 @@
+# Yeux
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nec
+condimentum lacus. Donec arcu lorem, sagittis nec nisi sit amet, lobortis
+elementum nisl. Etiam interdum porttitor eros non imperdiet. Donec non
+mollis lorem. Pellentesque euismod dui ac erat laoreet pellentesque. Fusce
+vestibulum, nunc eu scelerisque convallis, quam mi placerat elit, sit amet
+commodo nisi lacus vitae nisl. Ut tempor est ipsum, lacinia egestas tortor
+tincidunt id. Nam in turpis tellus. Sed id porta nulla. Phasellus sit amet
+arcu eu mi interdum sollicitudin et nec mi. Integer aliquam mi dui.
+Maecenas aliquet leo sit amet odio auctor finibus. Suspendisse a pulvinar
+purus.
diff --git a/Pages/yeux/A b/Pages/yeux/A
new file mode 100644
index 0000000..edcd7dd
--- /dev/null
+++ b/Pages/yeux/A
@@ -0,0 +1,33 @@
+# Yeux
+
+## A
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nec
+condimentum lacus. Donec arcu lorem, sagittis nec nisi sit amet, lobortis
+elementum nisl. Etiam interdum porttitor eros non imperdiet. Donec non
+mollis lorem. Pellentesque euismod dui ac erat laoreet pellentesque. Fusce
+vestibulum, nunc eu scelerisque convallis, quam mi placerat elit, sit amet
+commodo nisi lacus vitae nisl. Ut tempor est ipsum, lacinia egestas tortor
+tincidunt id. Nam in turpis tellus. Sed id porta nulla. Phasellus sit amet
+arcu eu mi interdum sollicitudin et nec mi. Integer aliquam mi dui.
+Maecenas aliquet leo sit amet odio auctor finibus. Suspendisse a pulvinar
+purus.
+
+![yeux](Images/yeux.jpg)
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nec
+condimentum lacus. Donec arcu lorem, sagittis nec nisi sit amet, lobortis
+elementum nisl. Etiam interdum porttitor eros non imperdiet. Donec non
+mollis lorem. Pellentesque euismod dui ac erat laoreet pellentesque. Fusce
+vestibulum, nunc eu scelerisque convallis, quam mi placerat elit, sit amet
+commodo nisi lacus vitae nisl. Ut tempor est ipsum, lacinia egestas tortor
+tincidunt id. Nam in turpis tellus. Sed id porta nulla. Phasellus sit amet
+arcu eu mi interdum sollicitudin et nec mi. Integer aliquam mi dui.
+Maecenas aliquet leo sit amet odio auctor finibus. Suspendisse a pulvinar
+purus.
+
+## Sources
+
+- [http://www.google.com/](http://www.google.com/)
+- [http://www.google.com/](http://www.google.com/)
+- [http://www.google.com/](http://www.google.com/)
diff --git a/Pages/yeux/A.md b/Pages/yeux/A.md
new file mode 100644
index 0000000..edcd7dd
--- /dev/null
+++ b/Pages/yeux/A.md
@@ -0,0 +1,33 @@
+# Yeux
+
+## A
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nec
+condimentum lacus. Donec arcu lorem, sagittis nec nisi sit amet, lobortis
+elementum nisl. Etiam interdum porttitor eros non imperdiet. Donec non
+mollis lorem. Pellentesque euismod dui ac erat laoreet pellentesque. Fusce
+vestibulum, nunc eu scelerisque convallis, quam mi placerat elit, sit amet
+commodo nisi lacus vitae nisl. Ut tempor est ipsum, lacinia egestas tortor
+tincidunt id. Nam in turpis tellus. Sed id porta nulla. Phasellus sit amet
+arcu eu mi interdum sollicitudin et nec mi. Integer aliquam mi dui.
+Maecenas aliquet leo sit amet odio auctor finibus. Suspendisse a pulvinar
+purus.
+
+![yeux](Images/yeux.jpg)
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nec
+condimentum lacus. Donec arcu lorem, sagittis nec nisi sit amet, lobortis
+elementum nisl. Etiam interdum porttitor eros non imperdiet. Donec non
+mollis lorem. Pellentesque euismod dui ac erat laoreet pellentesque. Fusce
+vestibulum, nunc eu scelerisque convallis, quam mi placerat elit, sit amet
+commodo nisi lacus vitae nisl. Ut tempor est ipsum, lacinia egestas tortor
+tincidunt id. Nam in turpis tellus. Sed id porta nulla. Phasellus sit amet
+arcu eu mi interdum sollicitudin et nec mi. Integer aliquam mi dui.
+Maecenas aliquet leo sit amet odio auctor finibus. Suspendisse a pulvinar
+purus.
+
+## Sources
+
+- [http://www.google.com/](http://www.google.com/)
+- [http://www.google.com/](http://www.google.com/)
+- [http://www.google.com/](http://www.google.com/)
diff --git a/font.css b/font.css
new file mode 100644
index 0000000..052f821
--- /dev/null
+++ b/font.css
@@ -0,0 +1,9 @@
+@font-face {
+ font-family: pacifico;
+ src: url(Fonts/pacifico.ttf);
+}
+
+@font-face {
+ font-family: NothingYouCouldSay;
+ src: url(Fonts/NothingYouCouldSay.ttf);
+}
diff --git a/index.html b/index.html
index 597850e..ab8718b 100644
--- a/index.html
+++ b/index.html
@@ -7,6 +7,7 @@
<script src="markdown.js"></script>
<script src="router.js"></script>
<link rel="stylesheet" type="text/css" href="reset.css">
+ <link rel="stylesheet" type="text/css" href="font.css">
<link rel="stylesheet" type="text/css" href="menu.css">
<link rel="stylesheet" type="text/css" href="style.css">
</head>
@@ -26,9 +27,9 @@
</ul>
</li>
<li>
- <a href="#">Yeux</a>
+ <a href="#/yeux">Yeux</a>
<ul class="hidden">
- <li><a href="#">A</a></li>
+ <li><a href="#/yeux/A">A</a></li>
<li><a href="#">B</a></li>
<li><a href="#">C</a></li>
<li><a href="#">D</a></li>
diff --git a/menu.css b/menu.css
index f6bcaea..3cc0af2 100644
--- a/menu.css
+++ b/menu.css
@@ -1,15 +1,10 @@
-@font-face {
- font-family: NothingYouCouldSay;
- src: url(NothingYouCouldSay.ttf);
-}
-
ul.menu {
position: absolute;
width: 900px;
display: table;
table-layout: fixed;
font-family: NothingYouCouldSay;
- font-size: 20px;
+ font-size: 21px;
}
ul.menu > li {
diff --git a/style.css b/style.css
index 434e7b9..c1d2ce2 100644
--- a/style.css
+++ b/style.css
@@ -1,8 +1,3 @@
-@font-face {
- font-family: pacifico;
- src: url(pacifico.ttf);
-}
-
body {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
background-color: #FBDEE3;