Skip to content

Commit 49c3f71

Browse files
cattermocattermo
committed
some stuff
1 parent 672e8cb commit 49c3f71

12 files changed

+222
-31
lines changed

‎.settings/settings.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// Place your settings in this file to overwrite default and user settings.
2+
{
3+
}

‎_config.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ avatar: https://raw.githubusercontent.com/barryclark/jekyll-now/master/images/je
1616
#
1717

1818
menu:
19-
- biografi
20-
- musik
21-
- noter
22-
- aktuellt
23-
- pressbilder
24-
- kontakt
19+
- Om mig
20+
- Min musik
21+
- Körer
22+
- Pressbilder
23+
- Kontakt
24+
- Potpurri
2525

2626
# Includes an icon in the footer for each username you enter
2727
footer-links:

‎_scss/base/_base.scss

+5-4
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ html, body {
1414
html {
1515
background-color: $fyr_color-darker-green;
1616

17-
17+
/*
1818
@include fyr_mq-gte-small {
1919
background-image: -webkit-linear-gradient(left, $fyr_color-darker-green $fyr_left-column-xsmall, $fyr_color-white $fyr_left-column-xsmall);
2020
background-image: -o-linear-gradient(left, $fyr_color-darker-green $fyr_left-column-xsmall, $fyr_color-white $fyr_left-column-xsmall);
2121
background-image: linear-gradient(to right, $fyr_color-darker-green $fyr_left-column-xsmall, $fyr_color-white $fyr_left-column-xsmall);
2222
}
23-
23+
*/
2424
@include fyr_mq-gte-medium {
2525
background-image: -webkit-linear-gradient(left, $fyr_color-darker-green $fyr_left-column-small, $fyr_color-white $fyr_left-column-small);
2626
background-image: -o-linear-gradient(left, $fyr_color-darker-green $fyr_left-column-small, $fyr_color-white $fyr_left-column-small);
@@ -53,6 +53,7 @@ h1 {
5353
}
5454

5555
h2 {
56+
@include fyr_text-h2;
5657
font-size: 24px;
5758
}
5859

@@ -70,12 +71,12 @@ p {
7071
}
7172

7273
a {
73-
color: $fyr_color-darker-blue;
74+
color: #C93ED7;
7475
text-decoration: none;
7576
cursor: pointer;
7677

7778
&:hover, &:active {
78-
color: $fyr_color-darker-blue;
79+
color: #C93ED7;
7980
text-decoration: underline;
8081
}
8182
}

‎_scss/base/_i-typography.scss

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
@mixin fyr_text-body {
2-
font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
2+
font-family: "Optima", "Calibri","Candara", sans-serif;
3+
//font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
34
@include font-size(12);
45
line-height: 1.4;
56
}
67

78
@mixin fyr_text-h1 {
8-
font-family: "Optima", "Calibri","Candara", sans-serif;
9+
font-family: "Georgia", serif;
910
@include font-size(17);
1011
line-height: 1.2;
12+
font-style: italic;
1113

1214
@include fyr_mq-gte-small {
1315
@include font-size(18);
1416
}
1517
}
1618

1719
@mixin fyr_text-h2 {
20+
font-family: "Georgia", serif;
21+
font-style: italic;
1822
@include font-size(15);
1923
line-height: 1.2;
2024

‎_scss/features/_container.scss

+4-13
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,10 @@ $_left-column-width-medium: 17em;
1515
.fyr_container__left {
1616
border-radius: 1em;
1717

18-
@include fyr_mq-gte-small {
19-
width: $_left-column-width;
20-
padding-right: 1em;
21-
float: left;
22-
}
23-
2418
@include fyr_mq-gte-medium {
2519
width: $_left-column-width-medium;
20+
padding-right: 1em;
21+
float: left;
2622
}
2723
}
2824

@@ -31,17 +27,12 @@ $_left-column-width-medium: 17em;
3127
background-color: rgba(255, 255, 255, 0.8);
3228
padding: 0.5em;
3329

34-
@include fyr_mq-gte-small {
30+
@include fyr_mq-gte-medium {
3531
margin-top: 0;
3632
background-color: transparent;
3733
float: left;
38-
width: 16em;
39-
width: calc(100% - #{$_left-column-width});
40-
padding: 0 0 0 1em;
41-
}
42-
43-
@include fyr_mq-gte-medium {
4434
width: 23em;
4535
width: calc(100% - #{$_left-column-width-medium});
36+
padding: 0 0 0 1em;
4637
}
4738
}

‎_scss/features/_header.scss

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
}
44

55
.fyr_header__name {
6-
@include fyr_text-h1;
6+
@include font-size(17);
7+
//font-family Optima
78
float: left;
89
width: 54%;
910

10-
@include fyr_mq-gte-small {
11+
@include fyr_mq-gte-medium {
1112
margin-top: 0.3em;
1213
float: none;
1314
width: 100%;

‎_scss/features/_keys.scss

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
.fyr_keys {
2+
margin-top: 0.5em;
3+
margin-bottom: 0.5em;
4+
text-align: center;
5+
perspective: 600px;
6+
@include left-column-width;
7+
8+
@include font-size(13);
9+
10+
@include fyr_mq-small {
11+
@include font-size(16);
12+
}
13+
14+
@include fyr_mq-gte-medium {
15+
@include font-size(20);
16+
}
17+
}
18+
19+
$_key-width: 0.5em;
20+
$_key-height: 3em;
21+
$_animation-delay-base: 0.2s;
22+
23+
.fyr_keys__key {
24+
display: inline-block;
25+
position: relative;
26+
width: $_key-width;
27+
height: $_key-height;
28+
margin-left: 0.5em;
29+
background-color: #000000;
30+
31+
&.fyr_keys__key--3 {
32+
margin-left: 1.5em;
33+
}
34+
35+
.fyr_keys--animate & {
36+
transform: translateX(300px) rotate(90deg) ;
37+
transform-origin: bottom left;
38+
39+
@include animation-name(fyr_fade-in);
40+
@include animation-duration(0.7s);
41+
@include animation-fill-mode(forwards);
42+
//@include animation-timing-function(linear);
43+
44+
&.fyr_keys__key--2 {
45+
@include animation-delay($_animation-delay-base * 1);
46+
}
47+
48+
&.fyr_keys__key--3 {
49+
@include animation-delay($_animation-delay-base * 2);
50+
}
51+
52+
&.fyr_keys__key--4 {
53+
@include animation-delay($_animation-delay-base * 3);
54+
}
55+
56+
&.fyr_keys__key--5 {
57+
@include animation-delay($_animation-delay-base * 4);
58+
}
59+
}
60+
}
61+
62+
@include keyframes(fyr_fade-in) {
63+
0% {
64+
transform: translateX(300px) rotate(90deg);
65+
}
66+
80% {
67+
transform: translateX(0) rotate(90deg);
68+
}
69+
100% {
70+
transform: rotate(0);
71+
}
72+
}

‎_scss/features/_snowflake.scss

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
$numbers: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 24 25 26 27 28 29 30 31 32 33 34 35;
2+
3+
.fyr_snowflake {
4+
position: absolute;
5+
z-index: -1;
6+
opacity: 0.02;
7+
8+
@each $num in $numbers {
9+
$width: 40 * random(5);
10+
$top: percentage(($num % 5) * 24 / 100);
11+
$left: percentage($num*3 /100);
12+
13+
&:nth-child(#{$num}) {
14+
top: $top;
15+
left: $left;
16+
width: #{$width}px;
17+
height: #{$width}px;
18+
}
19+
}
20+
}

‎_scss/helpers/_i-feature-mixins.scss

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
@mixin left-column-width {
2+
3+
@include fyr_mq-small {
4+
width: $fyr_left-column-xsmall;
5+
}
6+
7+
@include fyr_mq-medium {
8+
width: $fyr_left-column-small;
9+
}
10+
11+
@include fyr_mq-gte-large {
12+
width: $fyr_left-column-medium;
13+
}
14+
}

‎images/snowflakes4.svg

+84
Loading

‎korer/index.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
layout: default
3+
title: "Körer"
4+
---
5+

‎noter/index.md

-4
This file was deleted.

0 commit comments

Comments
 (0)