Skip to content

Commit cdf53c8

Browse files
RichardLittRichardLitt
committed
Created a Bootstrap-3 theme, readded the twitter theme, made bootstrap-3 default.
1 parent 4f98b59 commit cdf53c8

23 files changed

+1075
-102
lines changed

‎_includes/themes/bootstrap-3/default.html

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6+
7+
<title>{{ page.title }}</title>
8+
{% if page.description %}<meta name="description" content="{{ page.description }}">{% endif %}
9+
<meta name="author" content="{{ site.author.name }}">
10+
11+
<!-- Enable responsive viewport -->
12+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
13+
14+
<!-- Bootstrap styles -->
15+
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap.min.css" rel="stylesheet">
16+
<!-- Optional theme -->
17+
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap-theme.min.css" rel="stylesheet">
18+
<!-- Sticky Footer -->
19+
<link href="{{ ASSET_PATH }}/bootstrap/css/bs-sticky-footer.css" rel="stylesheet">
20+
21+
<!-- Custom styles -->
22+
<link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all">
23+
24+
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
25+
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
26+
<!--[if lt IE 9]>
27+
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
28+
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
29+
<![endif]-->
30+
31+
<!-- Fav and touch icons -->
32+
<!-- Update these with your own images
33+
<link rel="shortcut icon" href="images/favicon.ico">
34+
<link rel="apple-touch-icon" href="images/apple-touch-icon.png">
35+
<link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
36+
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
37+
-->
38+
39+
<!-- atom & rss feed -->
40+
<link href="{{ BASE_PATH }}{{ site.JB.atom_path }}" type="application/atom+xml" rel="alternate" title="Sitewide ATOM Feed">
41+
<link href="{{ BASE_PATH }}{{ site.JB.rss_path }}" type="application/rss+xml" rel="alternate" title="Sitewide RSS Feed">
42+
43+
</head>
44+
45+
<body>
46+
<div id="wrap">
47+
<nav class="navbar navbar-default" role="navigation">
48+
<!-- Brand and toggle get grouped for better mobile display -->
49+
<div class="navbar-header">
50+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#jb-navbar-collapse">
51+
<span class="sr-only">Toggle navigation</span>
52+
<span class="icon-bar"></span>
53+
<span class="icon-bar"></span>
54+
<span class="icon-bar"></span>
55+
</button>
56+
<a class="navbar-brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
57+
</div>
58+
59+
<!-- Collect the nav links, forms, and other content for toggling -->
60+
<div class="collapse navbar-collapse" id="jb-navbar-collapse">
61+
<ul class="nav navbar-nav">
62+
{% assign pages_list = site.pages %}
63+
{% assign group = 'navigation' %}
64+
{% include JB/pages_list %}
65+
</ul>
66+
<form class="navbar-form navbar-right" role="search">
67+
<div class="form-group">
68+
<input type="text" class="form-control" placeholder="Search">
69+
</div>
70+
<button type="submit" class="btn btn-default">Submit</button>
71+
</form>
72+
</div><!-- /.navbar-collapse -->
73+
</nav>
74+
75+
<div class="container">
76+
{{ content }}
77+
</div>
78+
79+
</div>
80+
81+
<div id="footer">
82+
<div class="container">
83+
<p>&copy; {{ site.time | date: '%Y' }} {{ site.author.name }}
84+
with help from <a href="http://jekyllbootstrap.com" target="_blank" title="The Definitive Jekyll Blogging Framework">Jekyll Bootstrap</a>
85+
and <a href="http://twitter.github.com/bootstrap/" target="_blank">Twitter Bootstrap</a>
86+
</p>
87+
</div>
88+
</div id="footer">
89+
90+
{% include JB/analytics %}
91+
92+
93+
<!-- Latest compiled and minified JavaScript, requires jQuery 1.x (2.x not supported in IE8) -->
94+
<!-- Placed at the end of the document so the pages load faster -->
95+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
96+
<script src="{{ ASSET_PATH }}/bootstrap/js/bootstrap.min.js"></script>
97+
</body>
98+
</html>

‎_includes/themes/bootstrap-3/page.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<div class="page-header">
2+
<h1>{{ page.title }} {% if page.tagline %} <small>{{ page.tagline }}</small>{% endif %}</h1>
3+
</div>
4+
5+
<div class="row">
6+
<div class="col-xs-12">
7+
{{ content }}
8+
</div>
9+
</div>

‎_includes/themes/bootstrap-3/post.html

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<div class="page-header">
2+
<h1>{{ page.title }} {% if page.tagline %}<small>{{page.tagline}}</small>{% endif %}</h1>
3+
</div>
4+
5+
<div class="row post-full">
6+
<div class="col-xs-12">
7+
<div class="date">
8+
<span>{{ page.date | date_to_long_string }}</span>
9+
</div>
10+
<div class="content">
11+
{{ content }}
12+
</div>
13+
14+
{% unless page.categories == empty %}
15+
<ul class="tag_box inline">
16+
<li><i class="glyphicon-open"></i></li>
17+
{% assign categories_list = page.categories %}
18+
{% include JB/categories_list %}
19+
</ul>
20+
{% endunless %}
21+
22+
{% unless page.tags == empty %}
23+
<ul class="tag_box inline">
24+
<li><i class="glyphicon-tags"></i></li>
25+
{% assign tags_list = page.tags %}
26+
{% include JB/tags_list %}
27+
</ul>
28+
{% endunless %}
29+
30+
<hr>
31+
<ul class="pagination">
32+
{% if page.previous %}
33+
<li class="prev"><a href="{{ BASE_PATH }}{{ page.previous.url }}" title="{{ page.previous.title }}">&laquo; Previous</a></li>
34+
{% else %}
35+
<li class="prev disabled"><a>&larr; Previous</a></li>
36+
{% endif %}
37+
<li><a href="{{ BASE_PATH }}{{ site.JB.archive_path }}">Archive</a></li>
38+
{% if page.next %}
39+
<li class="next"><a href="{{ BASE_PATH }}{{ page.next.url }}" title="{{ page.next.title }}">Next &raquo;</a></li>
40+
{% else %}
41+
<li class="next disabled"><a>Next &rarr;</a>
42+
{% endif %}
43+
</ul>
44+
<hr>
45+
{% include JB/comments %}
46+
</div>
47+
</div>

‎_includes/themes/bootstrap-3/settings.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
theme :
2+
name : bootstrap-3

‎_includes/themes/twitter/default.html

Lines changed: 29 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,29 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
75
<title>{{ page.title }}</title>
86
{% if page.description %}<meta name="description" content="{{ page.description }}">{% endif %}
97
<meta name="author" content="{{ site.author.name }}">
108

119
<!-- Enable responsive viewport -->
1210
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1311

14-
<!-- Bootstrap styles -->
15-
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap.min.css" rel="stylesheet">
16-
<!-- Optional theme -->
17-
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap-theme.min.css" rel="stylesheet">
18-
<!-- Sticky Footer -->
19-
<link href="{{ ASSET_PATH }}/bootstrap/css/bs-sticky-footer.css" rel="stylesheet">
20-
21-
<!-- Custom styles -->
22-
<link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all">
23-
24-
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
25-
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
12+
<!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
2613
<!--[if lt IE 9]>
27-
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
28-
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
14+
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
2915
<![endif]-->
3016

31-
<!-- Fav and touch icons -->
32-
<!-- Update these with your own images
33-
<link rel="shortcut icon" href="images/favicon.ico">
34-
<link rel="apple-touch-icon" href="images/apple-touch-icon.png">
35-
<link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
36-
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
37-
-->
17+
<!-- Le styles -->
18+
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap.2.2.2.min.css" rel="stylesheet">
19+
<link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all">
20+
21+
<!-- Le fav and touch icons -->
22+
<!-- Update these with your own images
23+
<link rel="shortcut icon" href="images/favicon.ico">
24+
<link rel="apple-touch-icon" href="images/apple-touch-icon.png">
25+
<link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
26+
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
27+
-->
3828

3929
<!-- atom & rss feed -->
4030
<link href="{{ BASE_PATH }}{{ site.JB.atom_path }}" type="application/atom+xml" rel="alternate" title="Sitewide ATOM Feed">
@@ -43,56 +33,34 @@
4333
</head>
4434

4535
<body>
46-
<div id="wrap">
47-
<nav class="navbar navbar-default" role="navigation">
48-
<!-- Brand and toggle get grouped for better mobile display -->
49-
<div class="navbar-header">
50-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#jb-navbar-collapse">
51-
<span class="sr-only">Toggle navigation</span>
52-
<span class="icon-bar"></span>
53-
<span class="icon-bar"></span>
54-
<span class="icon-bar"></span>
55-
</button>
56-
<a class="navbar-brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
57-
</div>
58-
59-
<!-- Collect the nav links, forms, and other content for toggling -->
60-
<div class="collapse navbar-collapse" id="jb-navbar-collapse">
61-
<ul class="nav navbar-nav">
36+
<div class="navbar">
37+
<div class="navbar-inner">
38+
<div class="container-narrow">
39+
<a class="brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
40+
<ul class="nav">
6241
{% assign pages_list = site.pages %}
6342
{% assign group = 'navigation' %}
6443
{% include JB/pages_list %}
6544
</ul>
66-
<form class="navbar-form navbar-right" role="search">
67-
<div class="form-group">
68-
<input type="text" class="form-control" placeholder="Search">
69-
</div>
70-
<button type="submit" class="btn btn-default">Submit</button>
71-
</form>
72-
</div><!-- /.navbar-collapse -->
73-
</nav>
74-
75-
<div class="container">
76-
{{ content }}
45+
</div>
7746
</div>
78-
7947
</div>
8048

81-
<div id="footer">
82-
<div class="container">
49+
<div class="container-narrow">
50+
51+
<div class="content">
52+
{{ content }}
53+
</div>
54+
<hr>
55+
<footer>
8356
<p>&copy; {{ site.time | date: '%Y' }} {{ site.author.name }}
8457
with help from <a href="http://jekyllbootstrap.com" target="_blank" title="The Definitive Jekyll Blogging Framework">Jekyll Bootstrap</a>
8558
and <a href="http://twitter.github.com/bootstrap/" target="_blank">Twitter Bootstrap</a>
8659
</p>
87-
</div>
88-
</div id="footer">
89-
90-
{% include JB/analytics %}
60+
</footer>
9161

62+
</div>
9263

93-
<!-- Latest compiled and minified JavaScript, requires jQuery 1.x (2.x not supported in IE8) -->
94-
<!-- Placed at the end of the document so the pages load faster -->
95-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
96-
<script src="{{ ASSET_PATH }}/bootstrap/js/bootstrap.min.js"></script>
64+
{% include JB/analytics %}
9765
</body>
9866
</html>

‎_includes/themes/twitter/page.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<h1>{{ page.title }} {% if page.tagline %} <small>{{ page.tagline }}</small>{% endif %}</h1>
33
</div>
44

5-
<div class="row">
6-
<div class="col-xs-12">
5+
<div class="row-fluid">
6+
<div class="span12">
77
{{ content }}
88
</div>
99
</div>

‎_includes/themes/twitter/post.html

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<h1>{{ page.title }} {% if page.tagline %}<small>{{page.tagline}}</small>{% endif %}</h1>
33
</div>
44

5-
<div class="row post-full">
6-
<div class="col-xs-12">
5+
<div class="row-fluid post-full">
6+
<div class="span12">
77
<div class="date">
88
<span>{{ page.date | date_to_long_string }}</span>
99
</div>
@@ -13,34 +13,36 @@ <h1>{{ page.title }} {% if page.tagline %}<small>{{page.tagline}}</small>{% endi
1313

1414
{% unless page.categories == empty %}
1515
<ul class="tag_box inline">
16-
<li><i class="glyphicon-open"></i></li>
16+
<li><i class="icon-folder-open"></i></li>
1717
{% assign categories_list = page.categories %}
1818
{% include JB/categories_list %}
1919
</ul>
2020
{% endunless %}
2121

2222
{% unless page.tags == empty %}
2323
<ul class="tag_box inline">
24-
<li><i class="glyphicon-tags"></i></li>
24+
<li><i class="icon-tags"></i></li>
2525
{% assign tags_list = page.tags %}
2626
{% include JB/tags_list %}
2727
</ul>
2828
{% endunless %}
29-
29+
3030
<hr>
31-
<ul class="pagination">
32-
{% if page.previous %}
33-
<li class="prev"><a href="{{ BASE_PATH }}{{ page.previous.url }}" title="{{ page.previous.title }}">&laquo; Previous</a></li>
34-
{% else %}
35-
<li class="prev disabled"><a>&larr; Previous</a></li>
36-
{% endif %}
37-
<li><a href="{{ BASE_PATH }}{{ site.JB.archive_path }}">Archive</a></li>
38-
{% if page.next %}
39-
<li class="next"><a href="{{ BASE_PATH }}{{ page.next.url }}" title="{{ page.next.title }}">Next &raquo;</a></li>
40-
{% else %}
41-
<li class="next disabled"><a>Next &rarr;</a>
42-
{% endif %}
43-
</ul>
31+
<div class="pagination">
32+
<ul>
33+
{% if page.previous %}
34+
<li class="prev"><a href="{{ BASE_PATH }}{{ page.previous.url }}" title="{{ page.previous.title }}">&larr; Previous</a></li>
35+
{% else %}
36+
<li class="prev disabled"><a>&larr; Previous</a></li>
37+
{% endif %}
38+
<li><a href="{{ BASE_PATH }}{{ site.JB.archive_path }}">Archive</a></li>
39+
{% if page.next %}
40+
<li class="next"><a href="{{ BASE_PATH }}{{ page.next.url }}" title="{{ page.next.title }}">Next &rarr;</a></li>
41+
{% else %}
42+
<li class="next disabled"><a>Next &rarr;</a>
43+
{% endif %}
44+
</ul>
45+
</div>
4446
<hr>
4547
{% include JB/comments %}
4648
</div>

‎_layouts/default.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
theme :
3-
name : twitter
3+
name : bootstrap-3
44
---
55
{% include JB/setup %}
6-
{% include themes/twitter/default.html %}
6+
{% include themes/bootstrap-3/default.html %}

‎_layouts/page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
layout: default
33
---
44
{% include JB/setup %}
5-
{% include themes/twitter/page.html %}
5+
{% include themes/bootstrap-3/page.html %}

‎_layouts/post.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
layout: default
33
---
44
{% include JB/setup %}
5-
{% include themes/twitter/post.html %}
5+
{% include themes/bootstrap-3/post.html %}

0 commit comments

Comments
 (0)