Skip to content

Commit 1f3596c

Browse files
plusjadeplusjade
committed
Merge pull request #197 from RichardLitt/master
Bootstrap 3
2 parents 6c4bbd9 + cdf53c8 commit 1f3596c

17 files changed

+519
-5
lines changed

‎_includes/JB/liquid_raw

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Using one will break the other if you plan to deploy to GitHub pages.
77
see: https://github.com/mojombo/jekyll/issues/425
88

99
Since I don't want to mess with Liquid versions, I'll just rewrite the way I
10-
intend to give liquid examples. It's not an elegant by any means:
10+
intend to give liquid examples. It's not an elegant solution by any means:
1111

1212
Usage:
1313
1) Define a 'text' variable with the block of liquid code you intend to display.

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

+98
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

+9
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

+47
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

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
theme :
2+
name : bootstrap-3

‎_layouts/default.html

+2-2
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

+1-1
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

+1-1
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 %}

‎assets/themes/bootstrap-3/bootstrap/css/bootstrap-theme.min.css

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/themes/bootstrap-3/bootstrap/css/bootstrap.min.css

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)