Skip to content

Commit 29eae1f

Browse files
committed
Upgrade to twitter bootstrap 2.2.2 plus new styling.
1 parent afec1ee commit 29eae1f

File tree

5 files changed

+867
-96
lines changed

5 files changed

+867
-96
lines changed

_includes/themes/twitter/default.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<![endif]-->
1616

1717
<!-- Le styles -->
18-
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap.min.css" rel="stylesheet">
18+
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap.2.2.2.min.css" rel="stylesheet">
1919
<link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all">
2020

2121
<!-- Le fav and touch icons -->
@@ -33,10 +33,9 @@
3333
</head>
3434

3535
<body>
36-
3736
<div class="navbar">
3837
<div class="navbar-inner">
39-
<div class="container-fluid">
38+
<div class="container-narrow">
4039
<a class="brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
4140
<ul class="nav">
4241
{% assign pages_list = site.pages %}
@@ -47,20 +46,20 @@
4746
</div>
4847
</div>
4948

50-
<div class="container-fluid">
49+
<div class="container-narrow">
5150

5251
<div class="content">
5352
{{ content }}
5453
</div>
55-
54+
<hr>
5655
<footer>
5756
<p>&copy; {{ site.author.name }} {{ site.time | date: '%Y' }}
5857
with help from <a href="http://jekyllbootstrap.com" target="_blank" title="The Definitive Jekyll Blogging Framework">Jekyll Bootstrap</a>
5958
and <a href="http://twitter.github.com/bootstrap/" target="_blank">Twitter Bootstrap</a>
6059
</p>
6160
</footer>
6261

63-
</div> <!-- /container-fluid -->
62+
</div>
6463

6564
{% include JB/analytics %}
6665
</body>

_includes/themes/twitter/post.html

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

5-
<div class="row-fluid">
6-
<div class="span8">
7-
{{ content }}
5+
<div class="row-fluid post-full">
6+
<div class="span12">
7+
<div class="date">
8+
<span>{{ page.date | date_to_long_string }}</strong>
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="icon-folder-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="icon-tags"></i></li>
25+
{% assign tags_list = page.tags %}
26+
{% include JB/tags_list %}
27+
</ul>
28+
{% endunless %}
29+
830
<hr>
931
<div class="pagination">
1032
<ul>
@@ -24,17 +46,4 @@ <h1>{{ page.title }} {% if page.tagline %}<small>{{page.tagline}}</small>{% endi
2446
<hr>
2547
{% include JB/comments %}
2648
</div>
27-
28-
<div class="span4">
29-
<h4>Published</h4>
30-
<div class="date"><span>{{ page.date | date_to_long_string }}</span></div>
31-
32-
{% unless page.tags == empty %}
33-
<h4>Tags</h4>
34-
<ul class="tag_box">
35-
{% assign tags_list = page.tags %}
36-
{% include JB/tags_list %}
37-
</ul>
38-
{% endunless %}
39-
</div>
40-
</div>
49+
</div>

0 commit comments

Comments
 (0)