From 1ebc608d2e5f9efa421b52cade02c2180ef50f30 Mon Sep 17 00:00:00 2001 From: choj Date: Mon, 7 Dec 2020 21:14:47 +0100 Subject: [PATCH] simplication footer, contenu & style page contact --- _config.yml | 8 +++-- _includes/contact.html | 9 +++--- _includes/footer.html | 33 ++++++++++--------- _layouts/home.html.back | 54 ------------------------------- _sass/_layout.scss | 63 +++++++++++++++++++++++++++---------- assets/images/copyleft.png | Bin 0 -> 922 bytes 6 files changed, 73 insertions(+), 94 deletions(-) delete mode 100644 _layouts/home.html.back create mode 100644 assets/images/copyleft.png diff --git a/_config.yml b/_config.yml index a623185..797ada0 100644 --- a/_config.yml +++ b/_config.yml @@ -21,7 +21,11 @@ title: Dylan Monin subtitle: cg artist email: dylan.monin@gmail.com -author: Allella +skills: Production 3D · VFX · Post production +phone: 06 71 88 26 64 +author: + label: Allella + site: https://allella.fr description: >- # this means to ignore newlines until "baseurl:" Dylan Monin website - CG Artist - France baseurl: "" # the subpath of your site, e.g. /blog @@ -44,7 +48,7 @@ defaults: type: category values: layout: "category" - + plugins: - jekyll-feed - jekyll-seo-tag diff --git a/_includes/contact.html b/_includes/contact.html index 54b52f2..a32d737 100644 --- a/_includes/contact.html +++ b/_includes/contact.html @@ -1,8 +1,9 @@
- -
+ +
{{site.title}}
-
{{site.email}}
-
01 02 03 04 05 06
+
{{site.skills}}
+
{{site.email}}
+
{{site.phone}}
diff --git a/_includes/footer.html b/_includes/footer.html index 60fcb13..65d74d2 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -3,40 +3,39 @@
-

{{ site.title | escape }}

-
    {%- if site.email -%} -
  • {{ site.email }}
    • + {{ site.email }} {%- endif -%} -
  • - {%- if site.author -%} - {{ site.author | escape }} - {%- else -%} - {{ site.title | escape }} - {%- endif -%} -
    • -
-
- {%- include social.html -%} -
+
-

{{- site.description | escape -}}

-
+

{{- site.description | escape -}} -

+ +

+ + +
+ {%- if site.author -%} + + copyleft logo + {{ site.author.label | escape }} + + {%- endif -%} +
+
diff --git a/_layouts/home.html.back b/_layouts/home.html.back deleted file mode 100644 index 3e020fb..0000000 --- a/_layouts/home.html.back +++ /dev/null @@ -1,54 +0,0 @@ - - - - {%- include head.html -%} - - - - {%- include header.html -%} - -
- - - -
-
- {%- if page.title -%} -

{{ page.title }}

- {%- endif -%} - {{ content }} - {%- if site.posts.size > 0 -%} - - -
    - {%- for post in site.posts -%} -
  • - {%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%} - - -

    - {{ post.title | escape }} - {{post.hometext}} -

    - {%- if site.show_excerpts -%} - {{ post.excerpt }} - {%- endif -%} -
    • - {%- endfor -%} -
- - - {%- endif -%} - -
-
-
- {%- include contact.html -%} - {%- include footer.html -%} - - - - diff --git a/_sass/_layout.scss b/_sass/_layout.scss index 8ba5b9c..ffc6f99 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -36,7 +36,7 @@ video#demo{ text-transform: uppercase; &,&:visited { - color: $grey-color-dark; + color: black;//$grey-color-dark; } .site-subtitle { @@ -138,6 +138,15 @@ video#demo{ padding: calc(#{$spacing-unit}/2) 0; background-color: $background-color; + a { + text-decoration: none; + color: $grey-color-dark; + + &:hover{ + color: $grey-color; + } + } + } .footer-heading { @@ -152,32 +161,41 @@ video#demo{ } .footer-col-wrapper { + display: flex; @include relative-font-size(0.9375); color: $grey-color; margin-left: -$spacing-unit / 2; @extend %clearfix; + p { + margin: 0; + } + align-items: center; + justify-content: center; } -.footer-col { - float: left; - margin-bottom: $spacing-unit / 2; - padding-left: $spacing-unit / 2; -} - +// .footer-col { +// float: left; +// padding-left: $spacing-unit / 2; +// } +// .footer-col-1 { - width: -webkit-calc(35% - (#{$spacing-unit} / 2)); - width: calc(35% - (#{$spacing-unit} / 2)); + flex: 1; } +// +// .footer-col-2 { +// width: -webkit-calc(20% - (#{$spacing-unit} / 2)); +// width: calc(20% - (#{$spacing-unit} / 2)); +// } +// +.footer-col-3 { + flex: 3; -.footer-col-2 { - width: -webkit-calc(20% - (#{$spacing-unit} / 2)); - width: calc(20% - (#{$spacing-unit} / 2)); + img{ + margin-left: 15px; + } } -.footer-col-3 { - width: -webkit-calc(45% - (#{$spacing-unit} / 2)); - width: calc(45% - (#{$spacing-unit} / 2)); -} + @include media-query($on-laptop) { .footer-col-1, @@ -299,7 +317,7 @@ video#demo{ font-size: 26px; line-height: 200%; font-weight: 600; - span{ + span.close{ position:fixed; top:10px; right: 10px; @@ -310,10 +328,21 @@ video#demo{ height:24px; } } + + span.logo{ + display: inline-block; + margin-right:5px; + } + + .text-uppercase{ + @include relative-font-size(2); + } &.shown{ z-index: 100; display : flex; justify-content: center; align-items: center; } + + } diff --git a/assets/images/copyleft.png b/assets/images/copyleft.png new file mode 100644 index 0000000000000000000000000000000000000000..e2061d23ed4acc6b77313a32ebbb73fd66bf4db5 GIT binary patch literal 922 zcmV;L17-Y)P)EX>4Tx04R}tkv&MmKpe$iQ>7vmhjtKg$WWauh>GZ@RVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRAQI0q!?cMvh^IDf zgY!Odl$B(a_?&puqze*1a$WKGjdRgufoDd|OnRO;N-P#TSm|I^GBx5!;+U%GlrLmG zRyl8R)+#mDx+i~OIIpiPbDic8l32tNB#2N@Lm3s=h|{W*Vj)fY2_OHU>zBx-kgE(v zjs;YqL3aJ%fAG6ot1vO{C500}_lx6v3vAGBz6gRB-thn5d+xjUoO@rz?^ZzrXK)T@(TuN;H+YHn7+_bys%T*eBYejymUC9~ zZ+qOH4nQ>fUx*aSYH!4f}8ur*IPWfNF^u1k*|m$5QH6 z0`}uDZlrzo(~pA wsVg#VX*-3b?fh+NOV7ygU!Rf6|9aSd0(eM>`2unC@Bjb+07*qoM6N<$g0h^M`Tzg` literal 0 HcmV?d00001