Skip to content

Commit d6031ce

Browse files
author
Kristopher Micinski
committed
fixups
1 parent 950e2b0 commit d6031ce

11 files changed

+61
-41
lines changed

_config.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Site settings
2-
title: "FordSec: Security at Haverford"
2+
title: "FordSec"
3+
subtitle: "Security Research at Haverford"
34
author: FordSec
45
author_avatar: https://gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s=50
56

_includes/header.html

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22
<div class="site-title">
33
{{ site.title }}
44
</div>
5+
<div class="site-subtitle">
6+
{{ site.subtitle }}
7+
</div>
8+
59
<div class="links">
610
{% assign current = page.title %}
7-
<a href="{{ site.baseurl }}/" class="page-link{% if current == null %} active{% endif %}">Blog</a>
11+
<a href="{{ site.baseurl }}/" class="page-link{% if current == null %} active{% endif %}">Home</a>
812
{% for page in site.pages %}
913
{% if page.title and page.permalink != "/404.html" %}
1014
<a class="page-link{% if current == page.title %} active{% endif %}"

_layouts/default.html

+1-8
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,7 @@
99

1010
{% include header.html %}
1111

12-
<div id="content">
13-
<div id="articles">
14-
<div class="article-list">
1512
{{ content }}
16-
</div>
17-
</div>
18-
</div>
19-
</div>
2013

2114
</body>
22-
</html>
15+
</html>

_layouts/page.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
layout: default
33
---
4-
{% include post.html %}
4+
{{ content }}

_posts/#2017-06-16-site-live.md#

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
layout: post
3+
title: "Website Live"
4+
category: posts
5+
date: 15-06-2017
6+
---
7+
8+
FordSec is live!

_posts/.#2017-06-16-site-live.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

_posts/2014-09-18-example-post.md

-11
This file was deleted.

_posts/2017-06-15-site-live.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
layout: post
3+
title: "Website Live"
4+
category: posts
5+
date: 15-06-2017
6+
---
7+
8+
FordSec is live!

blog.html

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
---
2-
layout: default
2+
layout: page
3+
title: Blog
4+
permalink: /blog
5+
comments: false
6+
author_footer: false
37
---
48

59
<div>
610

7-
{% assign index = true %}
8-
911
{% for post in site.posts %}
1012
{% assign page = post %}
1113
{% include post.html %}

css/main.css

+16-14
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
/* Base */
22
/* ----------------------------------------------------------*/
33

4-
* {
5-
margin: 0;
6-
padding: 0;
7-
}
8-
94
html, body { height: 100%; }
105

116
body {
127
font-family: "Open Sans";
138
font-size: 16px;
14-
line-height: 1.5;
159
font-weight: 300;
1610
background-color: #fdfdfd;
1711
}
1812

1913
h1, h2, h3, h4, h5, h6 { font-size: 100%; font-weight: 400; }
2014

15+
h1 {
16+
font-size: 20pt;
17+
};
18+
2119
a { color: #2a7ae2; text-decoration: none; }
2220
a:hover { color: #000; text-decoration: underline; }
2321
a:visited { color: #205caa; }
@@ -60,13 +58,20 @@ a:visited { color: #205caa; }
6058
margin-left: auto;
6159
margin-right: auto;
6260
color: #800000;
63-
font-size: 42px;
61+
font-weight: 600;
62+
font-size: 54pt;
6463
letter-spacing: -1px;
6564
line-height: 56px;
6665
position: relative;
6766
z-index: 1;
6867
}
6968

69+
.site-subtitle {
70+
font-size: 16pt;
71+
color: grey;
72+
font-weight: 600;
73+
}
74+
7075
.site-nav {
7176
margin-left: auto;
7277
margin-right: auto;
@@ -92,7 +97,7 @@ a:visited { color: #205caa; }
9297
font-size: 18px;
9398
font-weight: 300;
9499
letter-spacing: -.5px;
95-
margin-bottom: 15px;
100+
//margin-bottom: ;
96101
}
97102

98103
.site-footer .column { float: left; margin-bottom: 15px; }
@@ -452,9 +457,9 @@ em {
452457
}
453458

454459
#main-header {
455-
padding-bottom: 25px;
460+
padding-bottom: 10px;
456461
border-bottom: 2px solid black;
457-
margin: 40px auto 0 auto;
462+
margin: 40px auto 15px auto;
458463
}
459464

460465
.links {
@@ -485,7 +490,7 @@ em {
485490
}
486491

487492
#content {
488-
margin: 40px 0 0 0;
493+
//margin: 10px 0 0 0;
489494
}
490495

491496
#articles {
@@ -497,9 +502,6 @@ em {
497502

498503
.entry {
499504
overflow: auto;
500-
margin: 0 0 35px 0;
501-
padding-top: 35px;
502-
border-top: 1px solid #e7e7e7;
503505
}
504506
.entry h1 {
505507
font-weight: 700;

index.md

+14-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,23 @@
22
layout: page
33
---
44

5-
Welcome to FordSec, a computer security research group in [Haverford College](https://haverford.edu)'s [computer science](https://www.haverford.edu/computer-science) department.
5+
Welcome to FordSec, a computer security research group in
6+
[Haverford College](https://haverford.edu)'s
7+
[computer science](https://www.haverford.edu/computer-science)
8+
department. We work on foundational problems in security, programming
9+
languages, and human-computer interaction.
610

711
# News
812

9-
13+
<ul>
14+
{% for post in site.posts limit:5 %}
15+
<li>
16+
<a href="{{ post.url }}">
17+
({{ post.date | date: "%d %b, %Y" }}) {{ post.title }}
18+
</a>
19+
</li>
20+
{% endfor %}
21+
</ul>
1022

1123
# Projects
1224

0 commit comments

Comments
 (0)