Skip to content

Commit

Permalink
Merge pull request #132 from jkuchta/master
Browse files Browse the repository at this point in the history
Fully take advantage of bootstrap awesomeness but responsive
  • Loading branch information
plusjade committed Feb 24, 2013
2 parents c676106 + 5a77785 commit fcff62c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
9 changes: 6 additions & 3 deletions _includes/themes/twitter/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
{% if page.description %}<meta name="description" content="{{ page.description }}">{% endif %}
<meta name="author" content="{{ site.author.name }}">

<!-- Enable responsive viewport -->
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
Expand All @@ -28,7 +31,7 @@

<div class="navbar">
<div class="navbar-inner">
<div class="container">
<div class="container-fluid">
<a class="brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
<ul class="nav">
{% assign pages_list = site.pages %}
Expand All @@ -39,7 +42,7 @@
</div>
</div>

<div class="container">
<div class="container-fluid">

<div class="content">
{{ content }}
Expand All @@ -52,7 +55,7 @@
</p>
</footer>

</div> <!-- /container -->
</div> <!-- /container-fluid -->

{% include JB/analytics %}
</body>
Expand Down
2 changes: 1 addition & 1 deletion _includes/themes/twitter/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<h1>{{ page.title }} {% if page.tagline %} <small>{{ page.tagline }}</small>{% endif %}</h1>
</div>

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

<div class="row">
<div class="row-fluid">
<div class="span8">
{{ content }}
<hr>
Expand Down
4 changes: 4 additions & 0 deletions assets/themes/twitter/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,8 @@ html, body {
border:1px solid #4C964D;
color:#FFF;
}
footer p{
text-align: center;
margin-top: 4px;
}

0 comments on commit fcff62c

Please sign in to comment.