From 7e8d4bbeec9e235c3c20a22d14a3631e80be8ff9 Mon Sep 17 00:00:00 2001 From: theo lem <=> Date: Sat, 9 May 2020 14:25:16 +0200 Subject: [PATCH] fixed header, put images and article text in two columns. --- content/articles/construction.md | 7 +--- content/articles/courtyard.md | 6 ---- content/articles/sunday.md | 5 +-- output/construction.html | 26 +++++++------- output/courtyard.html | 23 ++++++------ output/feeds/all.atom.xml | 13 ++----- output/feeds/public.atom.xml | 13 ++----- output/index.html | 16 ++++----- output/pages/about.html | 6 ++-- output/pages/download.html | 6 ++-- output/sunday.html | 24 +++++++------ output/theme/css/main-v2.css | 51 +++++++++++++++++++-------- pelican_git_tuto.md | 2 ++ themes/felicie/static/css/main-v2.css | 51 +++++++++++++++++++-------- themes/felicie/templates/article.html | 12 ++++--- themes/felicie/templates/base.html | 2 +- themes/felicie/templates/index.html | 6 ++-- 17 files changed, 147 insertions(+), 122 deletions(-) diff --git a/content/articles/construction.md b/content/articles/construction.md index 47fdeb4..7003ef2 100644 --- a/content/articles/construction.md +++ b/content/articles/construction.md @@ -12,9 +12,4 @@ Authors: felicie autoplay loop class='audio'> Your browser does not support the HTML5 Audio element. - - -![01](images/construction/01-construction.jpg) -![02](images/construction/02-construction.JPG) -![03](images/construction/03-construction.JPG) -![04](images/construction/04-construction.JPG) \ No newline at end of file + \ No newline at end of file diff --git a/content/articles/courtyard.md b/content/articles/courtyard.md index 9b54fe1..af6cf0f 100644 --- a/content/articles/courtyard.md +++ b/content/articles/courtyard.md @@ -13,21 +13,15 @@ Summary: A man and a building. Your browser does not support the HTML5 Audio element. -![01](images/courtyard/01-courtyard.JPG) - ­He is less wary of how much of his emotions and thoughts is outward. The bird flying by startled him and his body actually shook. His ears were staring at the sound of a knife striking a cutting board. He is more surprised by his own reaction than by the bird. Birds fly by most of the time. He used to put a lot of effort into being as reserved in his private space as he would be with other people. When he takes the time to inspect this habit, he wonders if it would seem unreasonable to someone else. Deep down, he is afraid that being suddenly extrovert by himself without the rest of the world knowing about it would make him dishonest. And now, he begins to realize as he is facing himself all day long, and the days before, and the days to come, that he needs some kind of confrontation to replace basic social exchanges. He needs something or someone to go against him even only by pointing out that he is not doing so bad. Something like a conversation, that would bring the dialectic aspect life is missing. -![02](images/courtyard/02-courtyard.JPG) - He doesn’t like calling people as much as he would need to. The geographical loophole it creates makes him feel uneasy. He is working on ways to hide how awkward he is when hearing someone, who could just as well be on another planet for as far as he knows. It really is not that simple. He draws parallel lines with infinite care on a piece of paper that made the mistake of hanging around there too long. When both sides of the paper are filled, he uses a different color to draw new lines in between the first lines. At that point, the conversation seems illusive and his mind works up an excuse to hang up and a way to make that excuse come true, so that he doesn’t feel too dishonest because he really hates it. At sunset, he starts to think that the angle of the light on the stretch of earth where he lives, is not the same on the stretch of earth at the other end of the line. At the end of the day, he doesn’t like calling people. -![03](images/courtyard/03-courtyard.JPG) - He laughs out loud more regularly, and it sounds odd. Both liberated and self-aware at the same time. As if he was in actual social exchange, it is often followed by the need to express, out loud again, what was so funny that he couldn’t hold it in. The toothbrush on the side of the sink seems confused but if that is what it takes to be at peace with himself, it is happy to help. He also comments with either self-pity or candid interest everything he undertakes. He even talks back to himself sometimes, which he always assumed was the point of no return. But having the last word has become a matter of principle. diff --git a/content/articles/sunday.md b/content/articles/sunday.md index 6168375..5661250 100644 --- a/content/articles/sunday.md +++ b/content/articles/sunday.md @@ -12,7 +12,4 @@ Authors: felicie autoplay loop class='audio'> Your browser does not support the HTML5 Audio element. - - -![01](images/sunday/01-sunday.jpg) -![02](images/sunday/02-sunday.jpg) + \ No newline at end of file diff --git a/output/construction.html b/output/construction.html index bc90786..4e82f8b 100644 --- a/output/construction.html +++ b/output/construction.html @@ -10,30 +10,32 @@
-

better
days

 +

better days
-

Construction

-

by felicie

-

-

01 -02 -03 -04

-
+

+
+ + + + + +
+
\ No newline at end of file diff --git a/output/courtyard.html b/output/courtyard.html index d467dd4..21818dd 100644 --- a/output/courtyard.html +++ b/output/courtyard.html @@ -10,40 +10,43 @@
-

better
days

 +

better days
-

Courtyard

-

by felicie

-

-

01

­He is less wary of how much of his emotions and thoughts is outward. The bird flying by startled him and his body actually shook. His ears were staring at the sound of a knife striking a cutting board. He is more surprised by his own reaction than by the bird. Birds fly by most of the time. He used to put a lot of effort into being as reserved in his private space as he would be with other people. When he takes the time to inspect this habit, he wonders if it would seem unreasonable to someone else. Deep down, he is afraid that being suddenly extrovert by himself without the rest of the world knowing about it would make him dishonest. And now, he begins to realize as he is facing himself all day long, and the days before, and the days to come, that he needs some kind of confrontation to replace basic social exchanges. He needs something or someone to go against him even only by pointing out that he is not doing so bad. Something like a conversation, that would bring the dialectic aspect life is missing.

-

02

He doesn’t like calling people as much as he would need to. The geographical loophole it creates makes him feel uneasy. He is working on ways to hide how awkward he is when hearing someone, who could just as well be on another planet for as far as he knows. It really is not that simple. He draws parallel lines with infinite care on a piece of paper that made the mistake of hanging around there too long. When both sides of the paper are filled, he uses a different color to draw new lines in between the first lines. At that point, the conversation seems illusive and his mind works up an excuse to hang up and a way to make that excuse come true, so that he doesn’t feel too dishonest because he really hates it. At sunset, he starts to think that the angle of the light on the stretch of earth where he lives, is not the same on the stretch of earth at the other end of the line. At the end of the day, he doesn’t like calling people.

-

03

He laughs out loud more regularly, and it sounds odd. Both liberated and self-aware at the same time. As if he was in actual social exchange, it is often followed by the need to express, out loud again, what was so funny that he couldn’t hold it in. The toothbrush on the side of the sink seems confused but if that is what it takes to be at peace with himself, it is happy to help. He also comments with either self-pity or candid interest everything he undertakes. He even talks back to himself sometimes, which he always assumed was the point of no return. But having the last word has become a matter of principle.

He goes to the balcony twice a day to smoke a cigarette. It overlooks the courtyard, so it is just outside enough to give himself the impression that he is going somewhere. The junk and the dust lingering on the other balconies have made space to allow a chair and a reading person to get a bit of sunlight. He can hear neighbors laughing out loud, as they always had in peaceful sunny spring afternoon. They started to watch an old TV show last week. He knows the ending and can even tell some lines.

-
+
+ + + + + +
+
\ No newline at end of file diff --git a/output/feeds/all.atom.xml b/output/feeds/all.atom.xml index 0fcfc8a..b533555 100644 --- a/output/feeds/all.atom.xml +++ b/output/feeds/all.atom.xml @@ -4,26 +4,19 @@ autoplay loop class='audio'> Your browser does not support the HTML5 Audio element. -</audio></p> -<p><img alt="01" src="images/construction/01-construction.jpg"> -<img alt="02" src="images/construction/02-construction.JPG"> -<img alt="03" src="images/construction/03-construction.JPG"> -<img alt="04" src="images/construction/04-construction.JPG"></p>Courtyard2020-04-24T17:01:00+02:002020-04-24T17:01:00+02:00felicietag:fel.theo-lem.org,2020-04-24:/courtyard.html<p>A man and a building.</p><p><audio controls="controls" +</audio></p>Courtyard2020-04-24T17:01:00+02:002020-04-24T17:01:00+02:00felicietag:fel.theo-lem.org,2020-04-24:/courtyard.html<p>A man and a building.</p><p><audio controls="controls" src="sounds/courtyard.wav" autoplay loop class='audio'> Your browser does not support the HTML5 Audio element. </audio></p> -<p><img alt="01" src="images/courtyard/01-courtyard.JPG"></p> <p>­He is less wary of how much of his emotions and thoughts is outward. The bird flying by startled him and his body actually shook. His ears were staring at the sound of a knife striking a cutting board. He is more surprised by his own reaction than by the bird. Birds fly by most of the time. He used to put a lot of effort into being as reserved in his private space as he would be with other people. When he takes the time to inspect this habit, he wonders if it would seem unreasonable to someone else. Deep down, he is afraid that being suddenly extrovert by himself without the rest of the world knowing about it would make him dishonest. And now, he begins to realize as he is facing himself all day long, and the days before, and the days to come, that he needs some kind of confrontation to replace basic social exchanges. He needs something or someone to go against him even only by pointing out that he is not doing so bad. Something like a conversation, that would bring the dialectic aspect life is missing.</p> -<p><img alt="02" src="images/courtyard/02-courtyard.JPG"></p> <p>He doesn’t like calling people as much as he would need to. The geographical loophole it creates makes him feel uneasy. He is working on ways to hide how awkward he is when hearing someone, who could just as well be on another planet for as far as he knows. It really is not that simple. He draws parallel lines with infinite care on a piece of paper that made the mistake of hanging around there too long. When both sides of the paper are filled, he uses a different color to draw new lines in between the first lines. At that point, the conversation seems illusive and his mind works up an excuse to hang up and a way to make that excuse come true, so that he doesn’t feel too dishonest because he really hates it. At sunset, he starts to think that the angle of the light on the stretch of earth where he lives, is not the same on the stretch of earth at the other end of the line. At the end of the day, he doesn’t like calling people.</p> -<p><img alt="03" src="images/courtyard/03-courtyard.JPG"></p> <p>He laughs out loud more regularly, and it sounds odd. Both liberated and self-aware at the same time. As if he was in actual social exchange, it is often followed by the need to express, out loud again, what was so funny that he couldn’t hold it in. The toothbrush on the side of the sink seems confused but if that is what it takes to be at peace with himself, it is happy to help. He also comments with either self-pity or candid interest everything he undertakes. He even talks back to himself sometimes, which he always assumed was the point of no return. But having the last word has become a matter of principle.</p> <p>He goes to the balcony twice a day to smoke a cigarette. It overlooks the courtyard, so it is just outside enough to give himself the impression that he is going somewhere. The junk and the dust lingering on the other balconies have made space to allow a chair and a reading person to get a bit of sunlight. @@ -32,6 +25,4 @@ He can hear neighbors laughing out loud, as they always had in peaceful sunny sp autoplay loop class='audio'> Your browser does not support the HTML5 Audio element. -</audio></p> -<p><img alt="01" src="images/sunday/01-sunday.jpg"> -<img alt="02" src="images/sunday/02-sunday.jpg"></p> \ No newline at end of file +</audio></p> \ No newline at end of file diff --git a/output/feeds/public.atom.xml b/output/feeds/public.atom.xml index a00ba10..7e885c2 100644 --- a/output/feeds/public.atom.xml +++ b/output/feeds/public.atom.xml @@ -4,26 +4,19 @@ autoplay loop class='audio'> Your browser does not support the HTML5 Audio element. -</audio></p> -<p><img alt="01" src="images/construction/01-construction.jpg"> -<img alt="02" src="images/construction/02-construction.JPG"> -<img alt="03" src="images/construction/03-construction.JPG"> -<img alt="04" src="images/construction/04-construction.JPG"></p>Courtyard2020-04-24T17:01:00+02:002020-04-24T17:01:00+02:00felicietag:fel.theo-lem.org,2020-04-24:/courtyard.html<p>A man and a building.</p><p><audio controls="controls" +</audio></p>Courtyard2020-04-24T17:01:00+02:002020-04-24T17:01:00+02:00felicietag:fel.theo-lem.org,2020-04-24:/courtyard.html<p>A man and a building.</p><p><audio controls="controls" src="sounds/courtyard.wav" autoplay loop class='audio'> Your browser does not support the HTML5 Audio element. </audio></p> -<p><img alt="01" src="images/courtyard/01-courtyard.JPG"></p> <p>­He is less wary of how much of his emotions and thoughts is outward. The bird flying by startled him and his body actually shook. His ears were staring at the sound of a knife striking a cutting board. He is more surprised by his own reaction than by the bird. Birds fly by most of the time. He used to put a lot of effort into being as reserved in his private space as he would be with other people. When he takes the time to inspect this habit, he wonders if it would seem unreasonable to someone else. Deep down, he is afraid that being suddenly extrovert by himself without the rest of the world knowing about it would make him dishonest. And now, he begins to realize as he is facing himself all day long, and the days before, and the days to come, that he needs some kind of confrontation to replace basic social exchanges. He needs something or someone to go against him even only by pointing out that he is not doing so bad. Something like a conversation, that would bring the dialectic aspect life is missing.</p> -<p><img alt="02" src="images/courtyard/02-courtyard.JPG"></p> <p>He doesn’t like calling people as much as he would need to. The geographical loophole it creates makes him feel uneasy. He is working on ways to hide how awkward he is when hearing someone, who could just as well be on another planet for as far as he knows. It really is not that simple. He draws parallel lines with infinite care on a piece of paper that made the mistake of hanging around there too long. When both sides of the paper are filled, he uses a different color to draw new lines in between the first lines. At that point, the conversation seems illusive and his mind works up an excuse to hang up and a way to make that excuse come true, so that he doesn’t feel too dishonest because he really hates it. At sunset, he starts to think that the angle of the light on the stretch of earth where he lives, is not the same on the stretch of earth at the other end of the line. At the end of the day, he doesn’t like calling people.</p> -<p><img alt="03" src="images/courtyard/03-courtyard.JPG"></p> <p>He laughs out loud more regularly, and it sounds odd. Both liberated and self-aware at the same time. As if he was in actual social exchange, it is often followed by the need to express, out loud again, what was so funny that he couldn’t hold it in. The toothbrush on the side of the sink seems confused but if that is what it takes to be at peace with himself, it is happy to help. He also comments with either self-pity or candid interest everything he undertakes. He even talks back to himself sometimes, which he always assumed was the point of no return. But having the last word has become a matter of principle.</p> <p>He goes to the balcony twice a day to smoke a cigarette. It overlooks the courtyard, so it is just outside enough to give himself the impression that he is going somewhere. The junk and the dust lingering on the other balconies have made space to allow a chair and a reading person to get a bit of sunlight. @@ -32,6 +25,4 @@ He can hear neighbors laughing out loud, as they always had in peaceful sunny sp autoplay loop class='audio'> Your browser does not support the HTML5 Audio element. -</audio></p> -<p><img alt="01" src="images/sunday/01-sunday.jpg"> -<img alt="02" src="images/sunday/02-sunday.jpg"></p> \ No newline at end of file +</audio></p> \ No newline at end of file diff --git a/output/index.html b/output/index.html index 997891b..302b54c 100644 --- a/output/index.html +++ b/output/index.html @@ -10,24 +10,24 @@
-

better
days

 +

better days
- courtyard + courtyard

The courtyard

 - - construction + + construction

Construction workers

 - - sunday + + sunday

Sunday

 @@ -37,8 +37,8 @@
- download + about + download \ No newline at end of file diff --git a/output/pages/about.html b/output/pages/about.html index aad74a7..c33aa5e 100644 --- a/output/pages/about.html +++ b/output/pages/about.html @@ -10,7 +10,7 @@
-

better
days

 +

better days
@@ -21,8 +21,8 @@
- download + about + download \ No newline at end of file diff --git a/output/pages/download.html b/output/pages/download.html index f2266c7..f6c3492 100644 --- a/output/pages/download.html +++ b/output/pages/download.html @@ -10,7 +10,7 @@
-

better
days

 +

better days
@@ -19,8 +19,8 @@
- download + about + download \ No newline at end of file diff --git a/output/sunday.html b/output/sunday.html index bc5518c..5cce0e9 100644 --- a/output/sunday.html +++ b/output/sunday.html @@ -10,28 +10,32 @@
-

better
days

 +

better days
-

Sunday

-

by felicie

-

-

01 -02

-
+

+
+ + + + + +
+
\ No newline at end of file diff --git a/output/theme/css/main-v2.css b/output/theme/css/main-v2.css index 85014e2..6d44d89 100644 --- a/output/theme/css/main-v2.css +++ b/output/theme/css/main-v2.css @@ -15,21 +15,21 @@ h1{ } header{ + position: fixed; - z-index: 5; - margin-left: 80%; - top: 10%; height: 100px; - border: 3px solid #00FF00; - border-radius: 10px; - background-color: #ffffff; - padding: 20px; + background-color: white; + z-index: 15; display: flex; flex-direction: column; justify-content: center; - font; + border: 3px solid #00FF00; + border-radius: 10px; + + margin: 5px; + top: 0px; } #articles { @@ -78,7 +78,7 @@ header{ display: flex; z-index: 1; margin: 10px; - max-width: 70%; + max-width: 50%; position: relative; } @@ -88,6 +88,10 @@ header{ color: #0ff000; } +.img-menu { + width: 100%; +} + .vignette h2{ font-family: libertinage; font-size: 40px; @@ -103,7 +107,6 @@ header{ border: 3px solid #000000; border-radius: 10px; /* for chrome and safari support */ - max-width: 70%; } .img-menu:hover { @@ -140,10 +143,8 @@ p a { .content{ margin-top: 150px; - margin-left: 13%; padding-left: 2em; padding-bottom: 5em; - max-width: 50%; line-height: 1.2; font-size: 1.2em; text-align: justify; @@ -161,9 +162,29 @@ p a { display: none; } -.article-content img{ +.article-content p { + font-size: 1.2em; + line-height: 150%; + padding-right: 50px; +} + +.article-img img{ max-width: 60%; - margin: 3em; + width:60%; +} + +.article { + display: flex; +} + +.article::after { + content: ""; display: block; - + clear: both; +} + +.column { + float: left; + width: 50%; + padding: 15px; } \ No newline at end of file diff --git a/pelican_git_tuto.md b/pelican_git_tuto.md index 850166a..a5c67bc 100644 --- a/pelican_git_tuto.md +++ b/pelican_git_tuto.md @@ -1,5 +1,7 @@ # Faire un site avec Git et Pelican +[toc] + _Ce tuto est destiné aux débutant⋅e⋅s souhaitant réaliser un site avec Pelican et Git, deux outils très utiles. Il est écrit à l'arrache, mais il vise au maximum à être partagé et corrigé. J'ai notamment voulu utiliser l'écriture inclusive, mais les oublis sont sans doute légions, et je m'en excuse._ ## Les outils diff --git a/themes/felicie/static/css/main-v2.css b/themes/felicie/static/css/main-v2.css index 85014e2..6d44d89 100644 --- a/themes/felicie/static/css/main-v2.css +++ b/themes/felicie/static/css/main-v2.css @@ -15,21 +15,21 @@ h1{ } header{ + position: fixed; - z-index: 5; - margin-left: 80%; - top: 10%; height: 100px; - border: 3px solid #00FF00; - border-radius: 10px; - background-color: #ffffff; - padding: 20px; + background-color: white; + z-index: 15; display: flex; flex-direction: column; justify-content: center; - font; + border: 3px solid #00FF00; + border-radius: 10px; + + margin: 5px; + top: 0px; } #articles { @@ -78,7 +78,7 @@ header{ display: flex; z-index: 1; margin: 10px; - max-width: 70%; + max-width: 50%; position: relative; } @@ -88,6 +88,10 @@ header{ color: #0ff000; } +.img-menu { + width: 100%; +} + .vignette h2{ font-family: libertinage; font-size: 40px; @@ -103,7 +107,6 @@ header{ border: 3px solid #000000; border-radius: 10px; /* for chrome and safari support */ - max-width: 70%; } .img-menu:hover { @@ -140,10 +143,8 @@ p a { .content{ margin-top: 150px; - margin-left: 13%; padding-left: 2em; padding-bottom: 5em; - max-width: 50%; line-height: 1.2; font-size: 1.2em; text-align: justify; @@ -161,9 +162,29 @@ p a { display: none; } -.article-content img{ +.article-content p { + font-size: 1.2em; + line-height: 150%; + padding-right: 50px; +} + +.article-img img{ max-width: 60%; - margin: 3em; + width:60%; +} + +.article { + display: flex; +} + +.article::after { + content: ""; display: block; - + clear: both; +} + +.column { + float: left; + width: 50%; + padding: 15px; } \ No newline at end of file diff --git a/themes/felicie/templates/article.html b/themes/felicie/templates/article.html index 5e6ab26..6d63b95 100644 --- a/themes/felicie/templates/article.html +++ b/themes/felicie/templates/article.html @@ -5,9 +5,13 @@ {% endblock title %} {% block content %} -

{{ article.title }}

-

by {{ article.author }}

-
{{ article.content }}
-
+
+
{{ article.content }}
+
+ {% for i in [1, 2, 3, 4, 5] %} + + {% endfor %} +
+
{% endblock content %} \ No newline at end of file diff --git a/themes/felicie/templates/base.html b/themes/felicie/templates/base.html index a4caa12..0bb090d 100644 --- a/themes/felicie/templates/base.html +++ b/themes/felicie/templates/base.html @@ -9,7 +9,7 @@
-

better
days

 +

better days
diff --git a/themes/felicie/templates/index.html b/themes/felicie/templates/index.html index 686ad30..4ddeb6d 100644 --- a/themes/felicie/templates/index.html +++ b/themes/felicie/templates/index.html @@ -8,17 +8,17 @@
- courtyard + courtyard

The courtyard

 - construction + construction

Construction workers

 - sunday + sunday

Sunday