Skip to content
This repository has been archived by the owner on Nov 30, 2024. It is now read-only.

Bootstrap 2.0.1 #50

Merged
merged 1 commit into from
Mar 1, 2012
Merged

Bootstrap 2.0.1 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Update to bootstrap 2.0.1
  • Loading branch information
@daz
daz committed Mar 1, 2012
commit 309a6f47206317e8b501672b3edd1bd2e33215e7
6 changes: 3 additions & 3 deletions _includes/themes/twitter/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<![endif]-->

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

<!-- Le fav and touch icons -->
Expand All @@ -26,8 +26,8 @@

<body>

<div class="topbar">
<div class="fill">
<div class="navbar">
<div class="navbar-inner">
<div class="container">
<a class="brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
<ul class="nav">
Expand Down
2 changes: 1 addition & 1 deletion _includes/themes/twitter/page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ <h1>{{ page.title }} <small>Supporting tagline</small></h1>
</div>

<div class="row">
<div class="span14">
<div class="span12">
{{ content }}
</div>
</div>
2 changes: 1 addition & 1 deletion _includes/themes/twitter/post.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ <h1>{{ page.title }} <small>Supporting tagline</small></h1>
</div>

<div class="row">
<div class="span10">
<div class="span8">
{{ content }}
<hr>
<div class="pagination">
Expand Down
632 changes: 632 additions & 0 deletions assets/themes/twitter/bootstrap/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added assets/themes/twitter/bootstrap/img/glyphicons-halflings-white.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/themes/twitter/bootstrap/img/glyphicons-halflings.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
356 changes: 0 additions & 356 deletions assets/themes/twitter/css/1.4.0/bootstrap.css
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions assets/themes/twitter/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
html, body {
background-color: #eee;
}
body {
padding-top: 40px; /* 40px to make the container go all the way to the bottom of the topbar */
.navbar {
margin-bottom: 0;
}
.container > footer {
margin-top: 20px;
}
.container > footer p {
text-align: center; /* center align it with the container */
}
.container {
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. */
}

/* The white background content wrapper */
.content {
Expand Down