Skip to content

Commit dc6c98e

Browse files
pnathanpnathan
committed
Ported over. TODO: fix links.
1 parent 2954deb commit dc6c98e

23 files changed

+112
-1105
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
*~
2-
_site/*
2+
_site/*
3+
site/*
4+
*/_site/*

‎jekyll/_config.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# Jekyll configuration
22

3-
name: My blog
3+
name: articulate-lisp.com
44
description: A jekyll theme
55

66
# url is currently only used only for the RSS feed in feed.xml
7-
url: http://scotte.github.io
7+
url: http://articulate-lisp.com
88

99
# baseurl will often be '', but for a project page on gh-pages, it needs to
1010
# be the project name.
1111
# *** IMPORTANT: If your local "jekyll serve" throws errors change this to '' or
1212
# run it like so: jekyll serve --baseurl=''
13-
baseurl: /jekyll-clean
13+
baseurl: /
1414

1515
# This can be '' to hide the Github nav button
16-
github: 'scotte/jekyll-clean'
16+
github: 'pnathan/articulate-common-lisp'
1717

1818
# Set this to your UA-# value, or '' to disable the block completely
1919
gaaccount: ''

‎jekyll/_includes/footer.html‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
<div class="container-fluid">
22
<div class="row-fluid">
3-
<div class="span12 footer navbar-inverse navbar-fixed-bottom">
4-
<p class="copyright">&copy;{{ site.time | date: '%Y' }} {{ site.name }}. Powered by <a href="http://jekyllrb.com">Jekyll</a>, theme by <a href="https://github.com/scotte/jekyll-clean">Scott Emmons</a>
3+
<div class="span12">
4+
<center>
5+
&lambda;
6+
</center>
7+
8+
<footer class="footer">
9+
&copy; Paul Nathan and others; licenced under the AGPL3 except where specified.
10+
<p>
11+
<a href="https://github.com/{{ site.github }}"> Github source</a> - contributions welcome!
12+
<p>
13+
Powered by <a href="http://jekyllrb.com">Jekyll</a>,
14+
theme by <a href="https://github.com/scotte/jekyll-clean">Scott Emmons</a>
515
under
616
<a href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution</a></p>
17+
</footer>
718
</div>
819
</div>
920
</div>
1021

11-
{% include disqus-counts.html %}
1222
{% include analytics.html %}
1323

1424
</body>

‎jekyll/_includes/header.html‎

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,53 @@
11
<!DOCTYPE html>
22
<html lang="en">
33

4-
<head>
4+
<head>
55
<meta charset="UTF-8">
66
<title>{{ site.name }}</title>
77
<meta name="viewport" content="width=device-width, initial-scale=1.0">
88
<script src="{{ site.baseurl }}/js/jquery.min.js"></script>
99
<script src="{{ site.baseurl }}/js/bootstrap.min.js"></script>
1010
<link href="{{ site.baseurl }}/css/bootstrap.min.css" rel="stylesheet">
1111
<link href="{{ site.baseurl }}/css/theme.css" rel="stylesheet">
12-
</head>
12+
</head>
1313

14-
<body>
14+
<body>
1515

16-
<div class="container-fluid">
17-
<div class="row-fluid">
16+
<div class="container-fluid">
17+
<div class="row-fluid">
1818
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
19-
<div class="navbar-header">
20-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
21-
<span class="sr-only">Toggle navigation</span>
22-
<span class="icon-bar"></span>
23-
<span class="icon-bar"></span>
24-
<span class="icon-bar"></span>
25-
</button>
26-
<a class="navbar-brand" href="{{ site.baseurl }}/">{{ site.name }}</a>
27-
</div>
28-
<-- SHIM THIS GOOP IN http://www.tournemille.com/blog/How-to-create-data-driven-navigation-in-Jekyll/ -->
29-
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
30-
<ul class="nav navbar-nav">
31-
<li class="active"><a href="{{ site.baseurl }}/">Home</a></li>
32-
<li class="active visible-xs-block"><a href="{{ site.baseurl }}/links.html">Links</a></li>
33-
<li class="active"><a href="{{ site.baseurl }}/archive.html">Archive</a></li>
34-
<li class="active"><a href="{{ site.baseurl }}/about.html">About</a></li>
35-
<li class="active"><a href="{{ site.baseurl }}/feed.xml">RSS</a></li>
36-
{% if site.github != '' %}
37-
<li class="active"><a href="https://github.com/{{ site.github }}">Github</a></li>
38-
{% endif %}
19+
<div class="navbar-header">
20+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
21+
<span class="sr-only">Toggle navigation</span>
22+
<span class="icon-bar"></span>
23+
<span class="icon-bar"></span>
24+
<span class="icon-bar"></span>
25+
</button>
26+
<a class="navbar-brand" href="{{ site.baseurl }}/">{{ site.name }}</a>
27+
</div>
28+
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
29+
<ul class="nav navbar-nav">
30+
31+
{% for header in site.data.nav %}
32+
{% if header.subcategories != null %}
33+
<li class="dropdown">
34+
<a href="{{ site.baseurl }}{{ header.url }}" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
35+
{{ header.title }}<b class="caret"></b></a>
36+
<ul class="dropdown-menu">
37+
{% for subcategory in header.subcategories %}
38+
<li><a href="{{ site.baseurl }}{{header.href}}{{ subcategory.subhref }}">{{ subcategory.subtitle }}</a></li>
39+
{% endfor %}
3940
</ul>
40-
</div>
41+
{% else %}
42+
<li>
43+
<a href="{{ site.baseurl }}{{ header.href }}">{{ header.title }}</a>
44+
{% endif %}
45+
</li>
46+
{% endfor %}
47+
48+
</ul>
49+
</div>
50+
4151
</div>
52+
</div>
4253
</div>
43-
</div>

‎jekyll/_layouts/default.html‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{% include header.html %}
22

3-
<div class="container container-left">
3+
<div id="wrap">
4+
<div class="container">
45
<div class="row">
5-
<div class="col-md-3 hidden-xs">
6-
{% include sidebar.html %}
7-
</div>
8-
<div class="col-md-9">
9-
{{ content }}
6+
<div class="col-md-9">
7+
<div class="content">
8+
{{ content }}
9+
</div>
1010
</div>
1111
</div>
1212
</div>
13+
</div>
1314

1415
{% include footer.html %}

‎jekyll/about.html‎

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

‎jekyll/css/theme.css‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,29 @@
11
body {
22
padding-top: 60px;
33
padding-bottom: 60px;
4+
color: #000;
45
}
56

67
.copyright {
78
color: #ffffff;
89
}
910

11+
.navbar {
12+
font-size: medium;
13+
}
14+
.navbar-inverse .navbar-nav > li > a {
15+
color: #54de61;
16+
}
17+
1018
.footer {
19+
color: #777777;
20+
font-size: x-small;
1121
text-align: center;
1222
}
1323

24+
1425
.footer a {
15-
color: #ee4444;
26+
color: blue;
1627
}
1728

1829
.sidebar h1 {

‎jekyll/env~IDE.md‎

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

‎jekyll/env~ccl-setup.md‎

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

‎jekyll/env~cusp-setup.md‎

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

0 commit comments

Comments
 (0)