Skip to content

Commit 8c9a9a7

Browse files
committed
Revert "Upgrade to Jekyll 2.1.1, use Sass, tweak styles"
This reverts commit dc42f62.
1 parent bf73f28 commit 8c9a9a7

6 files changed

Lines changed: 118 additions & 151 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-
highlighter: pygments
3+
pygments: true

_layouts/default.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ <h1 class="title">{{ site.name }}</h1>
1515
<h2>Maker of Things</h2>
1616
</header>
1717

18-
<div id="content">
19-
{{ content }}
20-
</div>
18+
{{ content }}
2119

2220
<footer>
2321
<a href="https://github.com/DevoNoel" target="_blank"><i class="fa fa-github"></i></a>

_site/css/main.css

100644100755
Lines changed: 46 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,69 @@
1-
/* Mixins, imports, variables */
21
@import url(http://fonts.googleapis.com/css?family=Raleway:400,700,900);
32
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700);
4-
/* Global resets */
3+
4+
/* Global Reset */
55
* {
66
margin: 0;
7-
padding: 0; }
7+
padding: 0;
8+
}
89

9-
html {
10-
position: relative;
11-
min-height: 100%; }
10+
html, body { height: 100%; }
11+
12+
/* Le Styles */
1213

13-
/* Les styles */
1414
body {
15-
margin: 0 0 105px;
16-
background-color: #e05221;
17-
color: #3d210c;
18-
font-family: "Open Sans", "sans-serif";
19-
max-width: 1150px;
15+
position: relative;
16+
background-color: #E05221;
17+
color: #3D210C;
18+
font-family: 'Open Sans', 'sans-serif';
19+
padding: 50px;
20+
max-width: 1200px;
2021
min-width: 800px;
21-
margin: 0 auto;
22-
padding: 0 70px; }
23-
24-
header {
25-
margin-top: 52.5px; }
26-
27-
footer {
28-
position: absolute;
29-
bottom: 0;
30-
height: 105px;
31-
width: 100%; }
32-
footer a {
33-
color: #3d210c;
34-
font-size: 40px;
35-
padding-right: 10px; }
36-
37-
a {
38-
color: #5f442e;
39-
text-decoration: none; }
22+
height: 700px;
23+
margin: auto;
24+
box-sizing:border-box;
25+
-moz-box-sizing:border-box; /* Firefox */
26+
}
4027

41-
a:hover {
42-
color: #dddddd;
43-
text-decoration: none; }
28+
a { color: #3D210C; text-decoration: none; }
29+
a:hover { color: #DDD; text-decoration: none; }
4430

4531
h1, h2 {
46-
font-family: "Raleway", "sans-serif"; }
32+
font-family: 'Raleway', 'sans-serif';
33+
}
4734

4835
h1 {
4936
font-weight: 900;
50-
font-size: 60px; }
37+
font-size: 60px;
38+
}
5139

5240
h2 {
5341
font-weight: 700;
54-
font-size: 35px; }
42+
font-size: 35px;
43+
}
5544

56-
#content {
57-
height: 370px;
58-
line-height: 370px; }
45+
footer {
46+
position: absolute;
47+
bottom: 50px;
48+
font-size: 40px;
49+
}
50+
51+
footer a {
52+
padding-right: 10px;
53+
}
5954

6055
#index {
56+
margin: 100px auto;
57+
padding: 50px 0;
6158
font-size: 32px;
6259
line-height: 50px;
6360
text-align: right;
64-
display: inline-block;
65-
vertical-align: middle;
66-
width: 100%; }
61+
}
62+
63+
#index a {
64+
color: #5F442E;
65+
}
66+
67+
#index a:hover {
68+
color: #DDD;
69+
}

_site/index.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@ <h1 class="title">DevoNoel</h1>
1515
<h2>Maker of Things</h2>
1616
</header>
1717

18-
<div id="content">
19-
<div id="index">
18+
<div id="index">
2019
<h3>QA Engineer at <a href="http://500px.com/">500px</a>.</h3>
2120
<h3>Developer and mercenary for hire.</h3>
2221
<h3>Wiener dog enthusiast.</h3>
2322
</div>
2423

25-
</div>
2624

2725
<footer>
2826
<a href="https://github.com/DevoNoel" target="_blank"><i class="fa fa-github"></i></a>

css/main.css

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
@import url(http://fonts.googleapis.com/css?family=Raleway:400,700,900);
2+
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700);
3+
4+
/* Global Reset */
5+
* {
6+
margin: 0;
7+
padding: 0;
8+
}
9+
10+
html, body { height: 100%; }
11+
12+
/* Le Styles */
13+
14+
body {
15+
position: relative;
16+
background-color: #E05221;
17+
color: #3D210C;
18+
font-family: 'Open Sans', 'sans-serif';
19+
padding: 50px;
20+
max-width: 1200px;
21+
min-width: 800px;
22+
height: 700px;
23+
margin: auto;
24+
box-sizing:border-box;
25+
-moz-box-sizing:border-box; /* Firefox */
26+
}
27+
28+
a { color: #3D210C; text-decoration: none; }
29+
a:hover { color: #DDD; text-decoration: none; }
30+
31+
h1, h2 {
32+
font-family: 'Raleway', 'sans-serif';
33+
}
34+
35+
h1 {
36+
font-weight: 900;
37+
font-size: 60px;
38+
}
39+
40+
h2 {
41+
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+
}
54+
55+
#index {
56+
margin: 100px auto;
57+
padding: 50px 0;
58+
font-size: 32px;
59+
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+
}

css/main.scss

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

0 commit comments

Comments
 (0)