Skip to content

Commit f9aff72

Browse files
cattermocattermo
committed
New design and empty content pages
1 parent ee3f41c commit f9aff72

32 files changed

+1030
-473
lines changed

‎_config.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,26 @@
33
#
44

55
# Name of your site (displayed in the header)
6-
name: Test Jekyll
6+
name: Anna Cederberg-Orreteg
77

88
# Short bio or description (displayed in the header)
9-
description: Testing the Jekyll at Github pages
9+
description: "Tonsättare, musiklärare, körledare"
1010

1111
# URL of your avatar or profile pic (you could use your GitHub profile pic)
1212
avatar: https://raw.githubusercontent.com/barryclark/jekyll-now/master/images/jekyll-logo.png
13-
13+
1414
#
1515
# Flags below are optional
1616
#
1717

18+
menu:
19+
- biografi
20+
- musik
21+
- noter
22+
- aktuellt
23+
- pressbilder
24+
- kontakt
25+
1826
# Includes an icon in the footer for each username you enter
1927
footer-links:
2028
dribbble:

‎_includes/menu.html

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<nav class="fyr_menu">
2+
<ul class="fyr_menu__list">
3+
{% for item in site.menu %}<li class="fyr_menu__list-item">
4+
<a class="fyr_menu__link" href="/{{ item }}">{{item}}</a>
5+
</li>{% endfor %}
6+
</ul>
7+
</nav>

‎_layouts/default.html

+45-26
Original file line numberDiff line numberDiff line change
@@ -13,44 +13,63 @@
1313
<!--[if lt IE 9]>
1414
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
1515
<![endif]-->
16-
16+
<!--[if (lte IE 8)&!(IEMobile)]>
17+
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/iestyle.css" />
18+
<![endif]-->
19+
<!--[if (gte IE 9)|(IEMobile)|!(IE)]><!-->
1720
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/style.css" />
21+
<!--><![endif]-->
22+
1823
<link rel="alternate" type="application/rss+xml" title="{{ site.name }} - {{ site.description }}" href="{{ site.baseurl }}/feed.xml" />
1924

2025
<!-- Created with Jekyll Now - https://github.com/barryclark/jekyll-now -->
2126
</head>
2227

2328
<body>
24-
<div class="wrapper-masthead">
25-
<div class="container">
26-
<header class="masthead clearfix">
27-
<a href="{{ site.baseurl }}/" class="site-avatar"><img src="{{ site.avatar }}" /></a>
28-
29-
<div class="site-info">
30-
<h1 class="site-name"><a href="{{ site.baseurl }}/">{{ site.name }}</a></h1>
31-
<p class="site-description">{{ site.description }}</p>
29+
<div class="fyr_main-container">
30+
<div class="fyr_sheet{% if page.url == '/index.html'%} fyr_sheet--animate{% endif %}">
31+
<span class="fyr_sheet__lines">
32+
<span class="fyr_sheet__notes-wrapper">
33+
<span class="fyr_sheet__note fyr_sheet__note--1"></span>
34+
<span class="fyr_sheet__note fyr_sheet__note--2"></span>
35+
<span class="fyr_sheet__note fyr_sheet__note--3"></span>
36+
<span class="fyr_sheet__note fyr_sheet__note--4"></span>
37+
<span class="fyr_sheet__note fyr_sheet__note--5"></span>
38+
<span class="fyr_sheet__note fyr_sheet__note--6"></span>
39+
<span class="fyr_sheet__note fyr_sheet__note--7"></span>
40+
<span class="fyr_sheet__note fyr_sheet__note--8"></span>
41+
<span class="fyr_sheet__note fyr_sheet__note--9"></span>
42+
<span class="fyr_sheet__note fyr_sheet__note--10"></span>
43+
<span class="fyr_sheet__note fyr_sheet__note--11"></span>
44+
<span class="fyr_sheet__note fyr_sheet__note--12"></span>
45+
</span>
46+
</span>
47+
</div>
48+
<!-- <img class="fyr_masterhead__img" src="/images/anna.jpg" /> -->
49+
50+
<div id="main" role="main" class="fyr_container">
51+
<header class="fyr_container__left">
52+
<div class="fyr_header">
53+
<figure class="fyr_profile-picture">
54+
<img class="fyr_profile-picture__img" src="/images/anna.jpg" />
55+
<span class="fyr_profile-picture__blur"></span>
56+
</figure>
57+
<h1 class="fyr_header__name"><a href="{{ site.baseurl }}/">Anna <br/>Cederberg-Orreteg</a></h1>
58+
<p class="fyr_header__desc">{{ site.description }}</p>
3259
</div>
33-
34-
<nav>
35-
<a href="{{ site.baseurl }}/">Blog</a>
36-
<a href="{{ site.baseurl }}/about">About</a>
37-
</nav>
60+
{% include menu.html %}
3861
</header>
62+
<div class="fyr_container__right">
63+
{{ content }}
64+
</div>
3965
</div>
4066
</div>
41-
42-
<div id="main" role="main" class="container">
43-
{{ content }}
44-
</div>
45-
46-
<div class="wrapper-footer">
47-
<div class="container">
48-
<footer class="footer">
49-
{% include svg-icons.html %}
50-
</footer>
67+
<footer class="fyr_footer">
68+
<div class="fyr_sheet">
69+
<span class="fyr_sheet__lines"></span>
5170
</div>
52-
</div>
53-
71+
</footer>
72+
<div class="fyr_cover"></div>
5473
{% include analytics.html %}
5574
</body>
5675
</html>

‎_layouts/post.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ <h1>{{ page.title }}</h1>
1010
</div>
1111

1212
<div class="date">
13-
Written on {{ page.date | date: "%B %e, %Y" }}
13+
Skrivet {{ page.date | date: "%Y-%m-%d" }}
1414
</div>
1515

16-
{% include disqus.html disqus_identifier=page.disqus_identifier %}
1716
</article>

‎_scss/_all-styles.scss

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
@import "helpers/_i-mixins";
2+
@import "base/_i-variables";
3+
@import "base/_i-breakpoints";
4+
@import "helpers/_i-mediaqueries";
5+
@import "base/_reset";
6+
@import "base/_base";
7+
@import "base/_i-typography";
8+
@import "features/_main-container";
9+
@import "features/_container";
10+
@import "features/header";
11+
@import "features/profile-picture";
12+
@import "features/_menu";
13+
@import "features/_footer";
14+
@import "features/_cover";
15+
@import "features/_sheet";

‎_scss/_highlights.scss

-161
This file was deleted.

0 commit comments

Comments
 (0)