Skip to content

Commit b17122b

Browse files
devonoeldevonoel
committed
Jekyll 2.1.1, Sass version 2
1 parent 8c9a9a7 commit b17122b

4 files changed

Lines changed: 222 additions & 95 deletions

File tree

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
name: DevoNoel
22
markdown: redcarpet
3-
pygments: true
3+
highlighter: pygments

‎_site/css/main.css‎

100755100644
Lines changed: 37 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,59 @@
11
@import url(http://fonts.googleapis.com/css?family=Raleway:400,700,900);
22
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700);
3-
4-
/* Global Reset */
53
* {
64
margin: 0;
7-
padding: 0;
8-
}
9-
10-
html, body { height: 100%; }
5+
padding: 0; }
116

12-
/* Le Styles */
7+
html {
8+
position: relative;
9+
min-height: 100%; }
1310

1411
body {
15-
position: relative;
16-
background-color: #E05221;
17-
color: #3D210C;
18-
font-family: 'Open Sans', 'sans-serif';
19-
padding: 50px;
12+
margin: 0 0 100px 100px;
2013
max-width: 1200px;
2114
min-width: 800px;
22-
height: 700px;
23-
margin: auto;
24-
box-sizing:border-box;
25-
-moz-box-sizing:border-box; /* Firefox */
26-
}
15+
padding: 10px;
16+
background-color: #e05221;
17+
color: #3d210c;
18+
font-family: "Open Sans", "sans-serif";
19+
-webkit-box-sizing: border-box;
20+
-moz-box-sizing: border-box;
21+
box-sizing: border-box; }
2722

28-
a { color: #3D210C; text-decoration: none; }
29-
a:hover { color: #DDD; text-decoration: none; }
23+
header {
24+
padding-top: 50px; }
25+
26+
footer {
27+
position: absolute;
28+
bottom: 0;
29+
height: 100px;
30+
width: 230px;
31+
font-size: 40px; }
32+
footer a {
33+
color: #3d210c;
34+
padding-right: 10px; }
35+
36+
a {
37+
color: #5f442e;
38+
text-decoration: none; }
39+
40+
a:hover {
41+
color: #dddddd;
42+
text-decoration: none; }
3043

3144
h1, h2 {
32-
font-family: 'Raleway', 'sans-serif';
33-
}
45+
font-family: 'Raleway', 'sans-serif'; }
3446

3547
h1 {
3648
font-weight: 900;
37-
font-size: 60px;
38-
}
49+
font-size: 60px; }
3950

4051
h2 {
4152
font-weight: 700;
42-
font-size: 35px;
43-
}
44-
45-
footer {
46-
position: absolute;
47-
bottom: 50px;
48-
font-size: 40px;
49-
}
50-
51-
footer a {
52-
padding-right: 10px;
53-
}
53+
font-size: 35px; }
5454

5555
#index {
56-
margin: 100px auto;
57-
padding: 50px 0;
5856
font-size: 32px;
5957
line-height: 50px;
60-
text-align: right;
61-
}
62-
63-
#index a {
64-
color: #5F442E;
65-
}
66-
67-
#index a:hover {
68-
color: #DDD;
69-
}
58+
margin-top: 150px;
59+
text-align: right; }

‎css/main.css‎

100755100644
Lines changed: 37 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,59 @@
11
@import url(http://fonts.googleapis.com/css?family=Raleway:400,700,900);
22
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700);
3-
4-
/* Global Reset */
53
* {
64
margin: 0;
7-
padding: 0;
8-
}
9-
10-
html, body { height: 100%; }
5+
padding: 0; }
116

12-
/* Le Styles */
7+
html {
8+
position: relative;
9+
min-height: 100%; }
1310

1411
body {
15-
position: relative;
16-
background-color: #E05221;
17-
color: #3D210C;
18-
font-family: 'Open Sans', 'sans-serif';
19-
padding: 50px;
12+
margin: 0 0 100px 100px;
2013
max-width: 1200px;
2114
min-width: 800px;
22-
height: 700px;
23-
margin: auto;
24-
box-sizing:border-box;
25-
-moz-box-sizing:border-box; /* Firefox */
26-
}
15+
padding: 10px;
16+
background-color: #e05221;
17+
color: #3d210c;
18+
font-family: "Open Sans", "sans-serif";
19+
-webkit-box-sizing: border-box;
20+
-moz-box-sizing: border-box;
21+
box-sizing: border-box; }
2722

28-
a { color: #3D210C; text-decoration: none; }
29-
a:hover { color: #DDD; text-decoration: none; }
23+
header {
24+
padding-top: 50px; }
25+
26+
footer {
27+
position: absolute;
28+
bottom: 0;
29+
height: 100px;
30+
width: 230px;
31+
font-size: 40px; }
32+
footer a {
33+
color: #3d210c;
34+
padding-right: 10px; }
35+
36+
a {
37+
color: #5f442e;
38+
text-decoration: none; }
39+
40+
a:hover {
41+
color: #dddddd;
42+
text-decoration: none; }
3043

3144
h1, h2 {
32-
font-family: 'Raleway', 'sans-serif';
33-
}
45+
font-family: 'Raleway', 'sans-serif'; }
3446

3547
h1 {
3648
font-weight: 900;
37-
font-size: 60px;
38-
}
49+
font-size: 60px; }
3950

4051
h2 {
4152
font-weight: 700;
42-
font-size: 35px;
43-
}
44-
45-
footer {
46-
position: absolute;
47-
bottom: 50px;
48-
font-size: 40px;
49-
}
50-
51-
footer a {
52-
padding-right: 10px;
53-
}
53+
font-size: 35px; }
5454

5555
#index {
56-
margin: 100px auto;
57-
padding: 50px 0;
5856
font-size: 32px;
5957
line-height: 50px;
60-
text-align: right;
61-
}
62-
63-
#index a {
64-
color: #5F442E;
65-
}
66-
67-
#index a:hover {
68-
color: #DDD;
69-
}
58+
margin-top: 150px;
59+
text-align: right; }

‎css/main.scss‎

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
---
2+
---
3+
4+
@import url(http://fonts.googleapis.com/css?family=Raleway:400,700,900);
5+
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700);
6+
7+
$footer-height: 100px;
8+
$orange: #E05221;
9+
$dark-brown: #3D210C;
10+
$light-brown: #5F442E;
11+
$hover-color: #DDD;
12+
$open-sans: 'Open Sans', 'sans-serif';
13+
14+
@mixin box-sizing($box-model) {
15+
-webkit-box-sizing: $box-model;
16+
-moz-box-sizing: $box-model;
17+
box-sizing: $box-model;
18+
}
19+
20+
* {
21+
margin: 0;
22+
padding: 0;
23+
}
24+
25+
html {
26+
position: relative;
27+
min-height: 100%;
28+
}
29+
30+
body {
31+
margin: 0 0 $footer-height 100px;
32+
max-width: 1200px;
33+
min-width: 800px;
34+
padding: 10px;
35+
background-color: $orange;
36+
color: $dark-brown;
37+
font-family: $open-sans;
38+
@include box-sizing(border-box);
39+
}
40+
41+
header {
42+
padding-top: $footer-height / 2;
43+
}
44+
45+
footer {
46+
position: absolute;
47+
bottom: 0;
48+
height: $footer-height;
49+
width: 230px;
50+
font-size: 40px;
51+
52+
a {
53+
color: $dark-brown;
54+
padding-right: 10px;
55+
}
56+
}
57+
58+
a { color: $light-brown; text-decoration: none; }
59+
a:hover { color: $hover-color; text-decoration: none; }
60+
61+
h1, h2 {
62+
font-family: 'Raleway', 'sans-serif';
63+
}
64+
65+
h1 {
66+
font-weight: 900;
67+
font-size: 60px;
68+
}
69+
70+
h2 {
71+
font-weight: 700;
72+
font-size: 35px;
73+
}
74+
75+
#index {
76+
font-size: 32px;
77+
line-height: 50px;
78+
margin-top: 150px;
79+
text-align: right;
80+
}
81+
82+
// /* Global Reset */
83+
// * {
84+
// margin: 0;
85+
// padding: 0;
86+
// }
87+
//
88+
// html, body { height: 100%; }
89+
//
90+
// /* Le Styles */
91+
//
92+
// body {
93+
// position: relative;
94+
// background-color: #E05221;
95+
// color: #3D210C;
96+
// font-family: 'Open Sans', 'sans-serif';
97+
// padding: 50px;
98+
// max-width: 1200px;
99+
// min-width: 800px;
100+
// height: 700px;
101+
// margin: auto;
102+
// box-sizing:border-box;
103+
// -moz-box-sizing:border-box; /* Firefox */
104+
// }
105+
//
106+
// a { color: #3D210C; text-decoration: none; }
107+
// a:hover { color: #DDD; text-decoration: none; }
108+
//
109+
// h1, h2 {
110+
// font-family: 'Raleway', 'sans-serif';
111+
// }
112+
//
113+
// h1 {
114+
// font-weight: 900;
115+
// font-size: 60px;
116+
// }
117+
//
118+
// h2 {
119+
// font-weight: 700;
120+
// font-size: 35px;
121+
// }
122+
//
123+
// footer {
124+
// position: absolute;
125+
// bottom: 50px;
126+
// font-size: 40px;
127+
// }
128+
//
129+
// footer a {
130+
// padding-right: 10px;
131+
// }
132+
//
133+
// #index {
134+
// margin: 100px auto;
135+
// padding: 50px 0;
136+
// font-size: 32px;
137+
// line-height: 50px;
138+
// text-align: right;
139+
// }
140+
//
141+
// #index a {
142+
// color: #5F442E;
143+
// }
144+
//
145+
// #index a:hover {
146+
// color: #DDD;
147+
// }

0 commit comments

Comments
 (0)