Skip to content

Commit

Permalink
Upgrade to twitter bootstrap 2.2.2 plus new styling.
Browse files Browse the repository at this point in the history
  • Loading branch information
plusjade committed Feb 24, 2013
1 parent afec1ee commit 29eae1f
Show file tree
Hide file tree
Showing 5 changed files with 867 additions and 96 deletions.
11 changes: 5 additions & 6 deletions _includes/themes/twitter/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<![endif]-->

<!-- Le styles -->
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap.2.2.2.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 @@ -33,10 +33,9 @@
</head>

<body>

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

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

<div class="content">
{{ content }}
</div>

<hr>
<footer>
<p>&copy; {{ site.author.name }} {{ site.time | date: '%Y' }}
with help from <a href="http://jekyllbootstrap.com" target="_blank" title="The Definitive Jekyll Blogging Framework">Jekyll Bootstrap</a>
and <a href="http://twitter.github.com/bootstrap/" target="_blank">Twitter Bootstrap</a>
</p>
</footer>

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

{% include JB/analytics %}
</body>
Expand Down
43 changes: 26 additions & 17 deletions _includes/themes/twitter/post.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,31 @@
<h1>{{ page.title }} {% if page.tagline %}<small>{{page.tagline}}</small>{% endif %}</h1>
</div>

<div class="row-fluid">
<div class="span8">
{{ content }}
<div class="row-fluid post-full">
<div class="span12">
<div class="date">
<span>{{ page.date | date_to_long_string }}</strong>
</div>
<div class="content">
{{ content }}
</div>

{% unless page.categories == empty %}
<ul class="tag_box inline">
<li><i class="icon-folder-open"></i></li>
{% assign categories_list = page.categories %}
{% include JB/categories_list %}
</ul>
{% endunless %}

{% unless page.tags == empty %}
<ul class="tag_box inline">
<li><i class="icon-tags"></i></li>
{% assign tags_list = page.tags %}
{% include JB/tags_list %}
</ul>
{% endunless %}

<hr>
<div class="pagination">
<ul>
Expand All @@ -24,17 +46,4 @@ <h1>{{ page.title }} {% if page.tagline %}<small>{{page.tagline}}</small>{% endi
<hr>
{% include JB/comments %}
</div>

<div class="span4">
<h4>Published</h4>
<div class="date"><span>{{ page.date | date_to_long_string }}</span></div>

{% unless page.tags == empty %}
<h4>Tags</h4>
<ul class="tag_box">
{% assign tags_list = page.tags %}
{% include JB/tags_list %}
</ul>
{% endunless %}
</div>
</div>
</div>
Loading

0 comments on commit 29eae1f

Please sign in to comment.