aboutsummaryrefslogtreecommitdiff
path: root/Pages
diff options
context:
space:
mode:
authorJoris Guyonvarch2015-02-15 16:27:40 +0100
committerJoris Guyonvarch2015-02-15 16:27:40 +0100
commite0aa371f230495abd53b01535cbba40e09c0b59c (patch)
tree1d897fb47beeebe2050f75ec428dffb8bfea9339 /Pages
parentca0c11b6e9f86efa9ca88833c49cd6413f438e09 (diff)
downloadmakeup-e0aa371f230495abd53b01535cbba40e09c0b59c.tar.gz
makeup-e0aa371f230495abd53b01535cbba40e09c0b59c.tar.bz2
makeup-e0aa371f230495abd53b01535cbba40e09c0b59c.zip
Using markdown instead of html to write pages
Diffstat (limited to 'Pages')
-rw-r--r--Pages/contact.html3
-rw-r--r--Pages/contact.md1
-rw-r--r--Pages/presentation.html3
-rw-r--r--Pages/presentation.md11
-rw-r--r--Pages/teint.md (renamed from Pages/teint.html)6
-rw-r--r--Pages/teint/ceci.md (renamed from Pages/teint/ceci.html)24
-rw-r--r--Pages/teint/cela.md (renamed from Pages/teint/cela.html)18
7 files changed, 34 insertions, 32 deletions
diff --git a/Pages/contact.html b/Pages/contact.html
deleted file mode 100644
index ab7fb04..0000000
--- a/Pages/contact.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="contact">
- Contact : Auriane Besnard
-</div>
diff --git a/Pages/contact.md b/Pages/contact.md
new file mode 100644
index 0000000..3d7a78f
--- /dev/null
+++ b/Pages/contact.md
@@ -0,0 +1 @@
+Contact : Auriane Besnard
diff --git a/Pages/presentation.html b/Pages/presentation.html
deleted file mode 100644
index 0dd9c4d..0000000
--- a/Pages/presentation.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Présentation</h1>
-
-<p>blabla…</p>
diff --git a/Pages/presentation.md b/Pages/presentation.md
new file mode 100644
index 0000000..a4dd337
--- /dev/null
+++ b/Pages/presentation.md
@@ -0,0 +1,11 @@
+# Présentation
+
+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/teint.html b/Pages/teint.md
index 5c7a5c7..b5e1b95 100644
--- a/Pages/teint.html
+++ b/Pages/teint.md
@@ -1,6 +1,6 @@
-<h1>Teint</h1>
+# Teint
-<p> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nec
+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
@@ -9,4 +9,4 @@ 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. </p>
+purus.
diff --git a/Pages/teint/ceci.html b/Pages/teint/ceci.md
index 01f4900..520afcb 100644
--- a/Pages/teint/ceci.html
+++ b/Pages/teint/ceci.md
@@ -1,8 +1,8 @@
-<h1>Teint</h1>
+# Teint
-<h2>Ceci</h2>
+## Ceci
-<p> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nec
+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
@@ -11,11 +11,11 @@ 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. </p>
+purus.
-<img src="Images/teint.jpg" alt="Teint">
+![teint](Images/teint.jpg)
-<p> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nec
+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
@@ -24,12 +24,10 @@ 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. </p>
+purus.
-<h2>Sources</h2>
+## Sources
-<ul>
- <li><a href="http://www.google.com/">http://www.google.com/</a></li>
- <li><a href="http://www.google.com/">http://www.google.com/</a></li>
- <li><a href="http://www.google.com/">http://www.google.com/</a></li>
-</ul>
+- [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/teint/cela.html b/Pages/teint/cela.md
index e7f9441..a124ca1 100644
--- a/Pages/teint/cela.html
+++ b/Pages/teint/cela.md
@@ -1,8 +1,8 @@
-<h1>Teint</h1>
+# Teint
-<h2>Cela</h2>
+## Cela
-<p> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nec
+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
@@ -11,12 +11,10 @@ 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. </p>
+purus.
-<ul>
- <li>Item 1</li>
- <li>Item 2</li>
- <li>Item 3</li>
-</ul>
+- Item 1
+- Item 2
+- Item 3
-<img src="Images/teint-cela.jpg">
+![teint](Images/teint-cela.jpg)