diff options
| author | Jade Dominguez <plusjade@gmail.com> | 2012-03-01 01:49:24 -0800 |
|---|---|---|
| committer | Jade Dominguez <plusjade@gmail.com> | 2012-03-01 01:49:40 -0800 |
| commit | 76d3a976dc1a7d4cacbebadff50402b6259aed86 (patch) | |
| tree | 663f7e0b472702bbaeb451310c65226f1b89c35d /_includes | |
| parent | b804d16d5b13da24ff1f896565ff9c466da77c2e (diff) | |
| parent | 309a6f47206317e8b501672b3edd1bd2e33215e7 (diff) | |
Merge remote-tracking branch 'daz/master' into jb-development. issue #50
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/themes/twitter/default.html | 6 | ||||
| -rw-r--r-- | _includes/themes/twitter/page.html | 2 | ||||
| -rw-r--r-- | _includes/themes/twitter/post.html | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/_includes/themes/twitter/default.html b/_includes/themes/twitter/default.html index cb1f306..a94394c 100644 --- 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 index 7ac6fab..6f25eb1 100644 --- a/_includes/themes/twitter/page.html +++ b/_includes/themes/twitter/page.html @@ -3,7 +3,7 @@ </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 index 416af10..0b9f472 100644 --- a/_includes/themes/twitter/post.html +++ b/_includes/themes/twitter/post.html @@ -3,7 +3,7 @@ </div> <div class="row"> - <div class="span10"> + <div class="span8"> {{ content }} <hr> <div class="pagination"> |