Skip to content

Commit 309a6f4

Browse files
committed
Update to bootstrap 2.0.1
1 parent 3a2df76 commit 309a6f4

File tree

8 files changed

+642
-366
lines changed

8 files changed

+642
-366
lines changed

_includes/themes/twitter/default.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<![endif]-->
1313

1414
<!-- Le styles -->
15-
<link href="{{ ASSET_PATH }}/css/1.4.0/bootstrap.css" rel="stylesheet">
15+
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap.min.css" rel="stylesheet">
1616
<link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all">
1717

1818
<!-- Le fav and touch icons -->
@@ -26,8 +26,8 @@
2626

2727
<body>
2828

29-
<div class="topbar">
30-
<div class="fill">
29+
<div class="navbar">
30+
<div class="navbar-inner">
3131
<div class="container">
3232
<a class="brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
3333
<ul class="nav">

_includes/themes/twitter/page.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ <h1>{{ page.title }} <small>Supporting tagline</small></h1>
33
</div>
44

55
<div class="row">
6-
<div class="span14">
6+
<div class="span12">
77
{{ content }}
88
</div>
99
</div>

_includes/themes/twitter/post.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ <h1>{{ page.title }} <small>Supporting tagline</small></h1>
33
</div>
44

55
<div class="row">
6-
<div class="span10">
6+
<div class="span8">
77
{{ content }}
88
<hr>
99
<div class="pagination">

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

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

assets/themes/twitter/css/1.4.0/bootstrap.css

-356
This file was deleted.

assets/themes/twitter/css/style.css

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
html, body {
33
background-color: #eee;
44
}
5-
body {
6-
padding-top: 40px; /* 40px to make the container go all the way to the bottom of the topbar */
5+
.navbar {
6+
margin-bottom: 0;
7+
}
8+
.container > footer {
9+
margin-top: 20px;
710
}
811
.container > footer p {
912
text-align: center; /* center align it with the container */
1013
}
11-
.container {
12-
width: 820px; /* downsize our container to make the content feel a bit tighter and more cohesive. NOTE: this removes two full columns from the grid, meaning you only go to 14 columns and not 16. */
13-
}
1414

1515
/* The white background content wrapper */
1616
.content {

0 commit comments

Comments
 (0)