Permalink
Browse files

Merge remote-tracking branch 'daz/master' into jb-development. issue #50

  • Loading branch information...
2 parents b804d16 + 309a6f4 commit 76d3a976dc1a7d4cacbebadff50402b6259aed86 @plusjade plusjade committed Mar 1, 2012
@@ -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">
@@ -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>
@@ -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">

Large diffs are not rendered by default.

Oops, something went wrong.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -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 {

0 comments on commit 76d3a97

Please sign in to comment.