Update to bootstrap 2.0.1

liufeng · Mar 1, 2012 · 309a6f4 · 309a6f4
1 parent 3a2df76
commit 309a6f4
Show file tree

Hide file tree

Showing 8 changed files with 642 additions and 366 deletions.
diff --git a/_includes/themes/twitter/default.html b/_includes/themes/twitter/default.html
@@ -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 -->
@@ -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">

diff --git a/_includes/themes/twitter/page.html b/_includes/themes/twitter/page.html
@@ -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>
diff --git a/_includes/themes/twitter/post.html b/_includes/themes/twitter/post.html
@@ -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">

diff --git a/assets/themes/twitter/bootstrap/css/bootstrap.min.css b/assets/themes/twitter/bootstrap/css/bootstrap.min.css
diff --git a/assets/themes/twitter/bootstrap/img/glyphicons-halflings-white.png b/assets/themes/twitter/bootstrap/img/glyphicons-halflings-white.png
diff --git a/assets/themes/twitter/bootstrap/img/glyphicons-halflings.png b/assets/themes/twitter/bootstrap/img/glyphicons-halflings.png
diff --git a/assets/themes/twitter/css/1.4.0/bootstrap.css b/assets/themes/twitter/css/1.4.0/bootstrap.css
diff --git a/assets/themes/twitter/css/style.css b/assets/themes/twitter/css/style.css
@@ -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 {