Possibly completed everything, actually.
This commit is contained in:
Richard Littauer
parent
531b59cb1c
commit
96dfd7f11e
5 changed files with 124 additions and 50 deletions
|
|
@ -11,18 +11,24 @@
|
|||
<!-- Enable responsive viewport -->
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<!-- Le styles -->
|
||||
<!-- Bootstrap styles -->
|
||||
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap.min.css" rel="stylesheet">
|
||||
<!-- Richard: Currently commented out until the site can be tested as is -->
|
||||
<!-- <link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all"> -->
|
||||
<!-- Optional theme -->
|
||||
<link href="{{ ASSET_PATH }}/bootstrap/css/bootstrap-theme.min.css" rel="stylesheet">
|
||||
<!-- Sticky Footer -->
|
||||
<link href="{{ ASSET_PATH }}/bootstrap/css/bs-sticky-footer.css" rel="stylesheet">
|
||||
|
||||
<!-- Le HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
|
||||
<!-- Custom styles -->
|
||||
<link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all">
|
||||
|
||||
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
|
||||
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
|
||||
<!--[if lt IE 9]>
|
||||
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
|
||||
<script src="{{ ASSET_PATH }}/bootstrap/js/response.min.js"></script>
|
||||
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
|
||||
<![endif]-->
|
||||
|
||||
<!-- Le fav and touch icons -->
|
||||
<!-- Fav and touch icons -->
|
||||
<!-- Update these with your own images
|
||||
<link rel="shortcut icon" href="images/favicon.ico">
|
||||
<link rel="apple-touch-icon" href="images/apple-touch-icon.png">
|
||||
|
|
@ -37,34 +43,55 @@
|
|||
</head>
|
||||
|
||||
<body>
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="container-narrow">
|
||||
<a class="brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
|
||||
<ul class="nav">
|
||||
{% assign pages_list = site.pages %}
|
||||
{% assign group = 'navigation' %}
|
||||
{% include JB/pages_list %}
|
||||
</ul>
|
||||
</div>
|
||||
<nav class="navbar navbar-default" role="navigation">
|
||||
<!-- Brand and toggle get grouped for better mobile display -->
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#jb-navbar-collapse">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
|
||||
</div>
|
||||
|
||||
<!-- Collect the nav links, forms, and other content for toggling -->
|
||||
<div class="collapse navbar-collapse" id="jb-navbar-collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
{% assign pages_list = site.pages %}
|
||||
{% assign group = 'navigation' %}
|
||||
{% include JB/pages_list %}
|
||||
</ul>
|
||||
<form class="navbar-form navbar-left" role="search">
|
||||
<div class="form-group">
|
||||
<input type="text" class="form-control" placeholder="Search">
|
||||
</div>
|
||||
<button type="submit" class="btn btn-default">Submit</button>
|
||||
</form>
|
||||
</div><!-- /.navbar-collapse -->
|
||||
</nav>
|
||||
|
||||
<div class="wrap">
|
||||
<div class="container">
|
||||
{{ content }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container-narrow">
|
||||
|
||||
<div class="content">
|
||||
{{ content }}
|
||||
</div>
|
||||
<hr>
|
||||
<footer>
|
||||
<footer>
|
||||
<div class="container">
|
||||
<p>© {{ site.time | date: '%Y' }} {{ site.author.name }}
|
||||
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>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
{% include JB/analytics %}
|
||||
|
||||
|
||||
<!-- Latest compiled and minified JavaScript, requires jQuery 1.x (2.x not supported in IE8) -->
|
||||
<!-- Placed at the end of the document so the pages load faster -->
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
|
||||
<script src="{{ ASSET_PATH }}/bootstrap/js/bootstrap.min.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
<h1>{{ page.title }} {% if page.tagline %} <small>{{ page.tagline }}</small>{% endif %}</h1>
|
||||
</div>
|
||||
|
||||
<div class="row-fluid">
|
||||
<div class="span12">
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
{{ content }}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
<h1>{{ page.title }} {% if page.tagline %}<small>{{page.tagline}}</small>{% endif %}</h1>
|
||||
</div>
|
||||
|
||||
<div class="row-fluid post-full">
|
||||
<div class="span12">
|
||||
<div class="row post-full">
|
||||
<div class="col-xs-12">
|
||||
<div class="date">
|
||||
<span>{{ page.date | date_to_long_string }}</span>
|
||||
</div>
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
{% unless page.categories == empty %}
|
||||
<ul class="tag_box inline">
|
||||
<li><i class="icon-folder-open"></i></li>
|
||||
<li><i class="glyphicon-open"></i></li>
|
||||
{% assign categories_list = page.categories %}
|
||||
{% include JB/categories_list %}
|
||||
</ul>
|
||||
|
|
@ -21,28 +21,26 @@
|
|||
|
||||
{% unless page.tags == empty %}
|
||||
<ul class="tag_box inline">
|
||||
<li><i class="icon-tags"></i></li>
|
||||
<li><i class="glyphicon-tags"></i></li>
|
||||
{% assign tags_list = page.tags %}
|
||||
{% include JB/tags_list %}
|
||||
</ul>
|
||||
{% endunless %}
|
||||
|
||||
<hr>
|
||||
<div class="pagination">
|
||||
<ul>
|
||||
{% if page.previous %}
|
||||
<li class="prev"><a href="{{ BASE_PATH }}{{ page.previous.url }}" title="{{ page.previous.title }}">← Previous</a></li>
|
||||
{% else %}
|
||||
<li class="prev disabled"><a>← Previous</a></li>
|
||||
{% endif %}
|
||||
<li><a href="{{ BASE_PATH }}{{ site.JB.archive_path }}">Archive</a></li>
|
||||
{% if page.next %}
|
||||
<li class="next"><a href="{{ BASE_PATH }}{{ page.next.url }}" title="{{ page.next.title }}">Next →</a></li>
|
||||
{% else %}
|
||||
<li class="next disabled"><a>Next →</a>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</div>
|
||||
<ul class="pagination">
|
||||
{% if page.previous %}
|
||||
<li class="prev"><a href="{{ BASE_PATH }}{{ page.previous.url }}" title="{{ page.previous.title }}">« Previous</a></li>
|
||||
{% else %}
|
||||
<li class="prev disabled"><a>← Previous</a></li>
|
||||
{% endif %}
|
||||
<li><a href="{{ BASE_PATH }}{{ site.JB.archive_path }}">Archive</a></li>
|
||||
{% if page.next %}
|
||||
<li class="next"><a href="{{ BASE_PATH }}{{ page.next.url }}" title="{{ page.next.title }}">Next »</a></li>
|
||||
{% else %}
|
||||
<li class="next disabled"><a>Next →</a>
|
||||
{% endif %}
|
||||
</ul>
|
||||
<hr>
|
||||
{% include JB/comments %}
|
||||
</div>
|
||||
|
|
|
|||
45
assets/themes/twitter/bootstrap/css/bs-sticky-footer.css
Normal file
45
assets/themes/twitter/bootstrap/css/bs-sticky-footer.css
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
/* Sticky footer styles
|
||||
-------------------------------------------------- */
|
||||
|
||||
html,
|
||||
body {
|
||||
height: 100%;
|
||||
/* The html and body elements cannot have any padding or margin. */
|
||||
}
|
||||
|
||||
/* Wrapper for page content to push down footer */
|
||||
#wrap {
|
||||
min-height: 100%;
|
||||
height: auto;
|
||||
/* Negative indent footer by its height */
|
||||
margin: 0 auto -60px;
|
||||
/* Pad bottom by footer height */
|
||||
padding: 0 0 60px;
|
||||
}
|
||||
|
||||
/* Set the fixed height of the footer here */
|
||||
footer {
|
||||
height: 60px;
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
|
||||
|
||||
/* Custom page CSS
|
||||
-------------------------------------------------- */
|
||||
/* Not required for template or sticky footer method. */
|
||||
|
||||
#wrap > .container {
|
||||
padding: 60px 15px 0;
|
||||
}
|
||||
.container .text-muted {
|
||||
margin: 20px 0;
|
||||
}
|
||||
|
||||
footer > .container {
|
||||
padding-left: 15px;
|
||||
padding-right: 15px;
|
||||
}
|
||||
|
||||
code {
|
||||
font-size: 80%;
|
||||
}
|
||||
|
|
@ -1,13 +1,17 @@
|
|||
/* Custom container */
|
||||
.container-narrow {
|
||||
|
||||
/* Replaced with normal container and standard footer */
|
||||
/*.container-narrow {
|
||||
margin: 0 auto;
|
||||
max-width: 700px; }
|
||||
|
||||
.container-narrow > hr {
|
||||
margin: 30px 0; }
|
||||
*/
|
||||
|
||||
.navbar .nav {
|
||||
float: right; }
|
||||
/* Replaced with standard BS3 Navbar */
|
||||
/*.navbar .nav {
|
||||
float: right; }*/
|
||||
|
||||
/* posts index */
|
||||
.post > h3.title {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue