diff --git a/config.toml b/config.toml index 579b407..05cd2b9 100644 --- a/config.toml +++ b/config.toml @@ -6,3 +6,4 @@ theme = "anna" [[menu.main]] name = "Accueil" url = "/" + weight = 10 diff --git a/content/portfolio/CV.md b/content/CV.md similarity index 64% rename from content/portfolio/CV.md rename to content/CV.md index 204f0ab..53f85cc 100644 --- a/content/portfolio/CV.md +++ b/content/CV.md @@ -1,6 +1,8 @@ --- title: "CV" date: 2020-07-04T15:09:49+02:00 -menu: "main" +menu: + main: + weight: 50 --- diff --git a/content/_index.md b/content/_index.md index 80704cc..e63a8fe 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,5 +1,5 @@ --- -title: "" +title: "Accueil" date: 2020-07-04T15:40:03+02:00 --- diff --git a/content/contact.md b/content/contact.md index 3d8cd2e..b352343 100644 --- a/content/contact.md +++ b/content/contact.md @@ -1,7 +1,9 @@ --- title: "Contact" date: 2020-07-04T16:17:52+02:00 -menu: "main" +menu: + main: + weight: 40 --- # Contact diff --git a/content/modelisation/index.md b/content/modelisation/index.md new file mode 100644 index 0000000..1835440 --- /dev/null +++ b/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 >}} diff --git a/content/modelisation/maison1.jpg b/content/modelisation/maison1.jpg new file mode 100644 index 0000000..61bd9f1 Binary files /dev/null and b/content/modelisation/maison1.jpg differ diff --git a/content/portfolio/modelisation.md b/content/portfolio/modelisation.md deleted file mode 100644 index 6e5eb35..0000000 --- a/content/portfolio/modelisation.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: "Modelisation" -date: 2020-07-04T15:09:42+02:00 -menu: "main" ---- - diff --git a/content/portfolio/osenbach/image1.jpg b/content/portfolio/osenbach/image1.jpg new file mode 100644 index 0000000..61bd9f1 Binary files /dev/null and b/content/portfolio/osenbach/image1.jpg differ diff --git a/content/portfolio/osenbach/image2.jpg b/content/portfolio/osenbach/image2.jpg new file mode 100644 index 0000000..678338b Binary files /dev/null and b/content/portfolio/osenbach/image2.jpg differ diff --git a/content/portfolio/osenbach/index.md b/content/portfolio/osenbach/index.md new file mode 100644 index 0000000..822f53b --- /dev/null +++ b/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 diff --git a/content/portfolio/realisation.md b/content/portfolio/realisation.md deleted file mode 100644 index 896789a..0000000 --- a/content/portfolio/realisation.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: "Realisation" -date: 2020-07-04T15:09:37+02:00 -menu: "main" ---- - diff --git a/content/realisation.md b/content/realisation.md new file mode 100644 index 0000000..37398a7 --- /dev/null +++ b/content/realisation.md @@ -0,0 +1,8 @@ +--- +title: "Realisation de plans 2D" +date: 2020-07-04T15:09:37+02:00 +menu: + main: + weight: 20 +--- + diff --git a/themes/anna/assets/sass/main.scss b/themes/anna/assets/sass/main.scss index c6bf615..a5c8d61 100644 --- a/themes/anna/assets/sass/main.scss +++ b/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; + } + } + } +} diff --git a/themes/anna/layouts/partials/header.html b/themes/anna/layouts/partials/header.html index ccf1e59..d42afe6 100644 --- a/themes/anna/layouts/partials/header.html +++ b/themes/anna/layouts/partials/header.html @@ -1,18 +1,16 @@ -
-
+ {{ end }} + +
+

Anna Uetwiller

+

Architecte - Dessinatrice

+
diff --git a/themes/anna/layouts/portfolio/single.html b/themes/anna/layouts/portfolio/single.html index ac65c29..96e5d32 100644 --- a/themes/anna/layouts/portfolio/single.html +++ b/themes/anna/layouts/portfolio/single.html @@ -1,13 +1,18 @@ {{ define "main" }}
-

{{ .Title }}

-
- {{ with .Params.images }} -
- -
- {{ end }} +
+

{{ .Title }}

+
    + {{ range .Params.images }} + {{ $img := $.Page.Resources.GetMatch . }} +
  • +
    + +
    +
  • + {{ end }} +
{{ .Content }}
diff --git a/themes/anna/layouts/shortcodes/gallery.html b/themes/anna/layouts/shortcodes/gallery.html new file mode 100644 index 0000000..a794342 --- /dev/null +++ b/themes/anna/layouts/shortcodes/gallery.html @@ -0,0 +1,3 @@ + diff --git a/themes/anna/layouts/shortcodes/img.html b/themes/anna/layouts/shortcodes/img.html new file mode 100644 index 0000000..315dbbc --- /dev/null +++ b/themes/anna/layouts/shortcodes/img.html @@ -0,0 +1,5 @@ +{{ $img := $.Page.Resources.GetMatch (.Get 0) }} +{{ $res_img := $img.Fill "600x400" }} + + {{ .Get 1 }} +