config.toml

@@ -6,3 +6,4 @@ theme = "anna"
 [[menu.main]]
     name = "Accueil"
     url = "/"
+    weight = 10

content/CV.md

@@ -1,6 +1,8 @@
 ---
 title: "CV"
 date: 2020-07-04T15:09:49+02:00
-menu: "main"
+menu:
+  main:
+    weight: 50
 ---
 

content/_index.md

@@ -1,5 +1,5 @@
 ---
-title: ""
+title: "Accueil"
 date: 2020-07-04T15:40:03+02:00
 ---
 

content/contact.md

@@ -1,7 +1,9 @@
 ---
 title: "Contact"
 date: 2020-07-04T16:17:52+02:00
-menu: "main"
+menu:
+  main:
+    weight: 40
 ---
 # Contact
 

content/modelisation/index.md

@@ -0,0 +1,19 @@
+---
+title: "Modelisation 3D"
+date: 2020-07-04T15:09:42+02:00
+menu:
+  main:
+    weight: 30
+---
+# Modélisation 3D de l'intérieur
+{{< gallery >}}
+  {{< img "maison1.jpg" "Image 1" "portfolio/osenbach" >}}
+  {{< img "maison1.jpg" "Image 1" "portfolio/osenbach" >}}
+{{< /gallery >}}
+
+# Modélisation 3D de l'extérieur
+{{< gallery >}}
+  {{< img "maison1.jpg" "Image 1" "portfolio/osenbach" >}}
+  {{< img "maison1.jpg" "Image 1" "portfolio/osenbach" >}}
+  {{< img "maison1.jpg" "Image 1" "portfolio/osenbach" >}}
+{{< /gallery >}}

content/portfolio/modelisation.md

@@ -1,6 +0,0 @@
----
-title: "Modelisation"
-date: 2020-07-04T15:09:42+02:00
-menu: "main"
----
-

content/portfolio/osenbach/index.md

@@ -0,0 +1,14 @@
+---
+title: "Maison à Osenbach"
+date: 2020-08-15T17:14:42+02:00
+images:
+  - image1.jpg
+  - image2.jpg
+  - image1.jpg
+  - image1.jpg
+  - image1.jpg
+  - image2.jpg
+  - image2.jpg
+  - image2.jpg
+---
+Contenu à écrire

content/portfolio/realisation.md

@@ -1,6 +0,0 @@
----
-title: "Realisation"
-date: 2020-07-04T15:09:37+02:00
-menu: "main"
----
-

content/realisation.md

@@ -0,0 +1,8 @@
+---
+title: "Realisation de plans 2D"
+date: 2020-07-04T15:09:37+02:00
+menu:
+  main:
+    weight: 20
+---
+

themes/anna/assets/sass/main.scss

@@ -38,10 +38,12 @@ body {
   align-items: center;
   margin-top: 1rem;
   margin-bottom: 2rem;
+  text-transform: uppercase;
 
   h1 {
     margin: 0;
     font-size: xx-large;
+    font-weight: bold;
   }
 
   h2 {
@@ -77,26 +79,14 @@ body {
   grid-area: content;
   display: flex;
   flex-direction: column;
-  align-items: center;
-}
-
-h1, h2, h3 {
-  color: #8c877d;
-}
-
-.galery {
-  display: flex;
-  justify-content: center;
-  flex-wrap: wrap;
-
-  a img {
-    margin: 0.5rem;
-  }
-}
-
-#contact {
+  align-items: flex-start;
   background-color: #f6f1ea;
-  width: 100%;
+  margin-right: 2rem;
+
+  h1 {
+    font-size: x-large;
+    font-weight: bold;
+  }
 
   p {
     margin: 1rem;
@@ -104,3 +94,52 @@ h1, h2, h3 {
     color: #8c877d;
   }
 }
+
+h1, h2, h3 {
+  color: #8c877d;
+}
+
+.gallery {
+  display: flex;
+  flex-wrap: wrap;
+
+  a {
+    margin: 0.5rem;
+    width: 20%;
+    img {
+      max-width:100%;
+      max-height:100%;
+    }
+  }
+}
+
+.portfolio {
+  h1 {
+    text-align: center;
+    margin-top: 1rem;
+    margin-bottom: 3rem;
+  }
+  ul {
+    margin-left: 1rem;
+    margin-right: 1rem;
+    display: flex;
+    flex-wrap: wrap;
+    li {
+      img {
+        max-width: 100%;
+      }
+      &:first-child {
+        width: 100%;
+      }
+      &:nth-child(3n) {
+        margin-left: 1rem;
+        margin-right: 1rem;
+      }
+      &:not(:first-child) {
+        width: 33.333333%;
+        flex: 0 1 calc(33.333333% - 0.666666rem);
+        margin-top: 1rem;
+      }
+    }
+  }
+}

themes/anna/layouts/partials/header.html

@@ -1,18 +1,16 @@
-<header>
-  <ul id="navbar">
-    <li><img id="logo" src="{{ relURL "logo.svg" }}"></li>
-    {{ range .Site.Menus.main }}
-      {{ if .HasChildren }}
-        {{ range .Children }}
-          <li><a href="{{ .URL }}">{{ .Name }}</a></li>
-        {{ end }}
-      {{ else }}
-      <li><a href="{{ .URL }}">{{ .Name }}</a></li>
+<ul id="navbar">
+  <li><img id="logo" src="{{ relURL "logo.svg" }}"></li>
+  {{ range .Site.Menus.main }}
+    {{ if .HasChildren }}
+      {{ range .Children }}
+        <li><a href="{{ .URL }}">{{ .Name }}</a></li>
       {{ end }}
+    {{ else }}
+    <li><a href="{{ .URL }}">{{ .Name }}</a></li>
     {{ end }}
-  </ul>
-  <div id="title">
-    <h1>Anna Uetwiller</h1>
-    <h2>Architecte - Dessinatrice</h2>
-  </div>
-</header>
+  {{ end }}
+</ul>
+<div id="title">
+  <h1>Anna Uetwiller</h1>
+  <h2>Architecte - Dessinatrice</h2>
+</div>

themes/anna/layouts/portfolio/single.html

@@ -1,13 +1,18 @@
 {{ define "main" }}
 <section class="section">
   <article>
-    <h1 class="title is-1">{{ .Title }}</h1>
-    <div class="content">
-      {{ with .Params.images }}
-      <figure class="title-image">
-        <img src="{{ index . 0 }}" alt="">
-      </figure>
-      {{ end }}
+    <div class="content portfolio">
+      <h1>{{ .Title }}</h1>
+      <ul>
+        {{ range .Params.images }}
+        {{ $img := $.Page.Resources.GetMatch . }}
+        <li>
+          <figure>
+            <img src="{{ $img.RelPermalink }}" alt="">
+          </figure>
+        </li>
+        {{ end }}
+      </ul>
       {{ .Content }}
     </div>
   </article>

themes/anna/layouts/shortcodes/gallery.html

@@ -0,0 +1,3 @@
+<div class="gallery">
+  {{.Inner}}
+</div>

themes/anna/layouts/shortcodes/img.html

@@ -0,0 +1,5 @@
+{{ $img := $.Page.Resources.GetMatch (.Get 0) }}
+{{ $res_img := $img.Fill "600x400" }}
+<a href="{{ .Get 2 | ref . }}">
+  <img src="{{ $res_img.RelPermalink }}" alt="{{ .Get 1 }}" />
+</a>