dje
/
dylanmonin
1
0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态

2 次代码提交
734ec620c0 ... 66dedbdd56

作者 SHA1 备注 提交日期
  choj 66dedbdd56 Merge branch 'master' of https://git.allella.fr/dje/dylanmonin into master 4 年前
  choj 1ebc608d2e simplication footer, contenu & style page contact 4 年前
共有 6 个文件被更改，包括 73 次插入 和 94 次删除
合并视图
Diff 选项
显示统计
  1. +6
    -2
      _config.yml
  2. +5
    -4
      _includes/contact.html
  3. +16
    -17
      _includes/footer.html
  4. +0
    -54
      _layouts/home.html.back
  5. +46
    -17
      _sass/_layout.scss
  6. 二进制
      assets/images/copyleft.png

+ 6
- 2
_config.yml 查看文件

@@ -21,7 +21,11 @@
title: Dylan Monin title: Dylan Monin
subtitle: cg artist subtitle: cg artist
email: dylan.monin@gmail.com 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:" description: >- # this means to ignore newlines until "baseurl:"
Dylan Monin website - CG Artist - France Dylan Monin website - CG Artist - France
baseurl: "" # the subpath of your site, e.g. /blog baseurl: "" # the subpath of your site, e.g. /blog
@@ -44,7 +48,7 @@ defaults:
type: category type: category
values: values:
layout: "category" layout: "category"
plugins: plugins:
- jekyll-feed - jekyll-feed
- jekyll-seo-tag - jekyll-seo-tag


+ 5
- 4
_includes/contact.html 查看文件

@@ -1,8 +1,9 @@
<div id="contact-screen"> <div id="contact-screen">
<span onclick="document.getElementById('contact-screen').classList.toggle('shown')"><img src="{{site.baseurl}}/assets/images/times-solid.svg"/></span>
<div>
<span class="close" onclick="document.getElementById('contact-screen').classList.toggle('shown')"><img src="{{site.baseurl}}/assets/images/times-solid.svg"/></span>
<div id="contact-content">
<div class="text-uppercase">{{site.title}}</div> <div class="text-uppercase">{{site.title}}</div>
<div>{{site.email}}</div>
<div>01 02 03 04 05 06</div>
<div>{{site.skills}}</div>
<div><span class="logo">🖂</span>{{site.email}}</div>
<div><span class="logo">☎</span>{{site.phone}}</div>
</div> </div>
</div> </div>

+ 16
- 17
_includes/footer.html 查看文件

@@ -3,40 +3,39 @@


<div class="wrapper"> <div class="wrapper">


<h2 class="footer-heading">{{ site.title | escape }}</h2>


<div class="footer-col-wrapper"> <div class="footer-col-wrapper">
<div class="footer-col footer-col-1"> <div class="footer-col footer-col-1">
<ul class="contact-list">
{%- if site.email -%} {%- if site.email -%}
<li><a class="u-email" href="mailto:{{ site.email }}">{{ site.email }}</a></li>
<a class="u-email" href="mailto:{{ site.email }}">{{ site.email }}</a>
{%- endif -%} {%- endif -%}
<li class="p-name">
{%- if site.author -%}
{{ site.author | escape }}
{%- else -%}
{{ site.title | escape }}
{%- endif -%}
</li>
</ul>
</div> </div>




<div class="footer-col footer-col-2">
{%- include social.html -%}
</div>



<div class="footer-col footer-col-3"> <div class="footer-col footer-col-3">
<p class="text-center">{{- site.description | escape -}}</p>
<div class="text-center">
<p class="text-center">{{- site.description | escape -}}
<a href="https://www.linkedin.com/in/dylan-monin-339a7150" target="_blank"> <a href="https://www.linkedin.com/in/dylan-monin-339a7150" target="_blank">
<img class="social-nw" src="{{site.baseurl}}/assets/images/linkedin-24.png"/> <img class="social-nw" src="{{site.baseurl}}/assets/images/linkedin-24.png"/>
</a> </a>
<a href="https://nirvred.artstation.com" target="_blank"> <a href="https://nirvred.artstation.com" target="_blank">
<img class="social-nw" src="{{site.baseurl}}/assets/images/artstation-32.png"/> <img class="social-nw" src="{{site.baseurl}}/assets/images/artstation-32.png"/>
</a> </a>
</div>

</p>
</div> </div>


<div class="footer-col footer-col-1 footer-author text-right">
{%- if site.author -%}
<a href="{{site.author.site}}" class="author">
<img title="copyleft" alt="copyleft logo" src="{{site.baseurl}}/assets/images/copyleft.png"/>
{{ site.author.label | escape }}
</a>
{%- endif -%}
</div>

</div> </div>


</div> </div>


+ 0
- 54
_layouts/home.html.back 查看文件

@@ -1,54 +0,0 @@
<!DOCTYPE html>
<html lang="{{ page.lang | default: site.lang | default: "en" }}">

{%- include head.html -%}

<body>

{%- include header.html -%}

<main class="page-content" aria-label="Content">

<video id="demo" src="/assets/demoreel2020.webm" type="video/webm" autoplay="true" muted="true">
</video>

<div class="wrapper">
<div class="home">
{%- if page.title -%}
<h1 class="page-heading">{{ page.title }}</h1>
{%- endif -%}
{{ content }}
{%- if site.posts.size > 0 -%}
<!-- <h2 class="post-list-heading">{{ page.list_title | default: "Posts" }}</h2> -->

<ul class="post-list row">
{%- for post in site.posts -%}
<li class="col-xl-4 col-lg-4 post-card d-none" data-category="{{post.category}}">
{%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%}
<!-- <span class="post-meta">{{ post.date | date: date_format }}</span> -->
<a class="post-link" href="{{ post.url | relative_url }}"><img src="{{post.image}}"/></a>
<h3>
{{ post.title | escape }}
<span class="home-tags">{{post.hometext}}</span>
</h3>
{%- if site.show_excerpts -%}
{{ post.excerpt }}
{%- endif -%}
</li>
{%- endfor -%}
</ul>

<!--
<p class="rss-subscribe">subscribe <a href="{{ "/feed.xml" | relative_url }}">via RSS</a></p>
-->
{%- endif -%}

</div>
</div>
</main>
{%- include contact.html -%}
{%- include footer.html -%}

</body>

</html>

+ 46
- 17
_sass/_layout.scss 查看文件

@@ -36,7 +36,7 @@ video#demo{
text-transform: uppercase; text-transform: uppercase;


&,&:visited { &,&:visited {
color: $grey-color-dark;
color: black;//$grey-color-dark;
} }


.site-subtitle { .site-subtitle {
@@ -138,6 +138,15 @@ video#demo{
padding: calc(#{$spacing-unit}/2) 0; padding: calc(#{$spacing-unit}/2) 0;
background-color: $background-color; background-color: $background-color;


a {
text-decoration: none;
color: $grey-color-dark;

&:hover{
color: $grey-color;
}
}

} }


.footer-heading { .footer-heading {
@@ -152,32 +161,41 @@ video#demo{
} }


.footer-col-wrapper { .footer-col-wrapper {
display: flex;
@include relative-font-size(0.9375); @include relative-font-size(0.9375);
color: $grey-color; color: $grey-color;
margin-left: -$spacing-unit / 2; margin-left: -$spacing-unit / 2;
@extend %clearfix; @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 { .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) { @include media-query($on-laptop) {
.footer-col-1, .footer-col-1,
@@ -299,7 +317,7 @@ video#demo{
font-size: 26px; font-size: 26px;
line-height: 200%; line-height: 200%;
font-weight: 600; font-weight: 600;
span{
span.close{
position:fixed; position:fixed;
top:10px; top:10px;
right: 10px; right: 10px;
@@ -310,10 +328,21 @@ video#demo{
height:24px; height:24px;
} }
} }

span.logo{
display: inline-block;
margin-right:5px;
}

.text-uppercase{
@include relative-font-size(2);
}
&.shown{ &.shown{
z-index: 100; z-index: 100;
display : flex; display : flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }


} }

二进制
assets/images/copyleft.png 查看文件

之前 之后
宽度: 18  |  高度: 18  |  大小: 922 B

撰写 预览
正在加载...
取消
保存