Skip to content
This repository was archived by the owner on Sep 11, 2021. It is now read-only.

Commit d79de2b

Browse files
dbtekdbtek
committed
Bootstrap 3 files added. Bootstrap 2 files removed. Theme files modified for bs3 under _includes
1 parent fed94a2 commit d79de2b

File tree

7 files changed

+40
-798
lines changed

7 files changed

+40
-798
lines changed

‎_includes/themes/twitter/default.html‎

Lines changed: 23 additions & 14 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.2.2.2.min.css" rel="stylesheet">
18+
<link href="{{ ASSET_PATH }}/bootstrap3/css/bootstrap.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,19 +33,28 @@
3333
</head>
3434

3535
<body>
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">
41-
{% assign pages_list = site.pages %}
42-
{% assign group = 'navigation' %}
43-
{% include JB/pages_list %}
44-
</ul>
45-
</div>
46-
</div>
47-
</div>
36+
<nav class="navbar navbar-default" role="navigation">
37+
<!-- Brand and toggle get grouped for better mobile display -->
38+
<div class="navbar-header">
39+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
40+
<span class="sr-only">Toggle navigation</span>
41+
<span class="icon-bar"></span>
42+
<span class="icon-bar"></span>
43+
<span class="icon-bar"></span>
44+
</button>
45+
<a class="navbar-brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
46+
</div>
4847

48+
<!-- Collect the nav links, forms, and other content for toggling -->
49+
<div class="collapse navbar-collapse navbar-ex1-collapse">
50+
<ul class="nav navbar-nav">
51+
{% assign pages_list = site.pages %}
52+
{% assign group = 'navigation' %}
53+
{% include JB/pages_list %}
54+
</ul>
55+
</div><!-- /.navbar-collapse -->
56+
</nav>
57+
4958
<div class="container-narrow">
5059

5160
<div class="content">
@@ -55,7 +64,7 @@
5564
<footer>
5665
<p>&copy; {{ site.time | date: '%Y' }} {{ site.author.name }}
5766
with help from <a href="http://jekyllbootstrap.com" target="_blank" title="The Definitive Jekyll Blogging Framework">Jekyll Bootstrap</a>
58-
and <a href="http://twitter.github.com/bootstrap/" target="_blank">Twitter Bootstrap</a>
67+
and <a href="http://getbootstrap.com" target="_blank">Twitter Bootstrap</a>
5968
</p>
6069
</footer>
6170

‎_includes/themes/twitter/post.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-fluid post-full">
6-
<div class="span12">
5+
<div class="row post-full">
6+
<div class="col-md12">
77
<div class="date">
88
<span>{{ page.date | date_to_long_string }}</span>
99
</div>

‎assets/themes/twitter/bootstrap/css/bootstrap.2.2.2.min.css‎

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

‎assets/themes/twitter/bootstrap/img/glyphicons-halflings-white.png‎

-8.57 KB
Binary file not shown.

‎assets/themes/twitter/bootstrap/img/glyphicons-halflings.png‎

-12.5 KB
Binary file not shown.

‎assets/themes/twitter/bootstrap3/css/bootstrap.min.css‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/themes/twitter/bootstrap3/js/bootstrap.min.js‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)