Skip to content

Commit 7fe7e3e

Browse files
deeppinesdeeppines
authored
Merge pull request #5 from deeppines/dev
minor update layout
2 parents ceb0a4b + 5e63f62 commit 7fe7e3e

File tree

16 files changed

+73
-183
lines changed

16 files changed

+73
-183
lines changed

‎404.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: page
2+
layout: default
33
permalink: /404.html
44
---
55

‎_includes/fonts.html‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎_includes/footer.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<footer class="footer txt-xs-center">
1+
<footer>
22
<p class="copyright">© 2016-2018
33
{% include icon-github.html %}. Powered by
44
<a href="https://jekyllrb.com/" target="_blank" rel="nofollow">Jekyll</a>, with a custom theme.

‎_includes/header-h1.html‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎_includes/header-nav.html‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎_includes/header.html‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
1-
{% include filter.html %}
2-
31
<header class="header header_background header_glass txt-xs-center">
2+
{% include filter.html %}
43
<div class="avatar avatar_center">
54
<img class="avatar__img" src="/images/avatar.jpg" alt="deeppines">
65
</div>
7-
<div class="title">
8-
<span>deep</span><a class="title__link" href="{{ site.baseurl }}/">pines</a>
9-
</div>
6+
7+
{% if page.url == '/' %}
8+
<h1 class="title">
9+
<span>deep</span><a class="title__link" href="{{ site.baseurl }}/">pines</a>
10+
</h1>
11+
{% else %}
12+
<div class="title">
13+
<span>deep</span><a class="title__link" href="{{ site.baseurl }}/">pines</a>
14+
</div>
15+
{% endif %}
16+
17+
{% if page.url == '/cv/' %}
18+
<nav class="nav">
19+
<a class="nav__link nav__link_active" href="{{ site.baseurl }}/cv">CV</a>
20+
<a class="nav__link" href="{{ site.baseurl }}/projects">Portfolio</a>
21+
</nav>
22+
{% elsif page.url == '/projects/' %}
23+
<nav class="nav">
24+
<a class="nav__link" href="{{ site.baseurl }}/cv">CV</a>
25+
<a class="nav__link nav__link_active" href="{{ site.baseurl }}/projects">Portfolio</a>
26+
</nav>
27+
{% endif %}
1028
</header>

‎_includes/icon-twitter.html‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎_includes/yandex-metrika.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- Yandex.Metrika counter -->
2-
<script type="text/javascript">
2+
<script>
33
(function (d, w, c) {
44
(w[c] = w[c] || []).push(function() {
55
try {

‎_layouts/default.html‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,13 @@
44
{% include head.html %}
55

66
<body>
7-
<div class="wrapper">
7+
{% include header.html %}
88

9-
{% include header-h1.html %}
9+
<main>
10+
{{ content }}
11+
</main>
1012

11-
<div class="flex-container">
12-
<main class="main">
13-
{{ content }}
14-
</main>
15-
</div>
16-
17-
{% include footer.html %}
18-
19-
</div>
13+
{% include footer.html %}
2014
</body>
2115

2216
</html>

‎_layouts/page-nav.html‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)