Skip to content

Commit 0922fb5

Browse files
committed
wrestling with bottom nav
1 parent c2b4a5f commit 0922fb5

File tree

4 files changed

+58
-24
lines changed

4 files changed

+58
-24
lines changed

Rakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ namespace :theme do
234234
end
235235

236236
puts "=> Theme successfully switched!"
237-
puts "=> Reload your web-page to check it out =)"
237+
puts "=> Reload your page to check it out"
238238
end # task :switch
239239

240240
# Public: Install a theme using the theme packager.

_includes/themes/lab/default.html

+45-20
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
</div>
9191

9292
</div>
93+
9394
</div>
9495

9596
{% comment %}
@@ -117,31 +118,55 @@
117118
</div><!--/.nav-collapse -->
118119
</div>
119120
</div>
120-
{% endcomment %}
121121

122-
<div id="footer">
123-
<div class="note">
122+
<footer class="footer">
123+
<div class='container'>
124+
<nav class="navbar navbar-default navbar-fixed-bottom">
124125
<div class='row'>
125-
<div class="col-xs-6">
126-
&copy; {{ site.time | date: '%Y' }} {{ site.author.name }}
127-
</div>
128-
<i class="fa fa-comment-o fa-fw"></i>
129-
<a class="off" href="#about">About</a>
130-
<div class="note">
131-
<i class="fa fa-comment-o fa-fw"></i>
132-
<a class="off" href="#about">
133-
Join
134-
</a>
135-
</div>
136-
<div class="note">
137-
<i class="fa fa-comment-o fa-fw"></i>
138-
<a class="off" href="#about">
139-
Contact
140-
</a>
141-
</div>
126+
<div class="col-md-9">
127+
<a href='http://bmb.uchospitals.edu'>Biochemistry & Molecular Biology</a> |
128+
<a href='http://uchicago.edu'>The University of Chicago</a>
129+
</div>
130+
<div class="col-md-1">
131+
<a href="">About</a>
132+
</div>
133+
<div class="col-md-1">
134+
<a href="">Join</a>
135+
</div>
136+
<div class="col-md-1">
137+
<a href="">Contact</a>
138+
</div>
142139
</div>
140+
</nav>
143141
</div>
144142
</div>
143+
{% endcomment %}
144+
145+
<!-- Static navbar -->
146+
<div class="navbar navbar-default navbar-fixed-bottom" role="navigation">
147+
<div class="navbar-header">
148+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
149+
<span class="sr-only">Toggle navigation</span>
150+
<span class="icon-bar"></span>
151+
<span class="icon-bar"></span>
152+
<span class="icon-bar"></span>
153+
</button>
154+
<a class="navbar-brand" href="#">Project name</a>
155+
</div>
156+
<div class="navbar-collapse collapse">
157+
158+
<!-- Left nav -->
159+
<ul class="nav navbar-nav">
160+
<li><a href="#">Link</a></li>
161+
</ul>
162+
163+
<!-- Right nav -->
164+
<ul class="nav navbar-nav navbar-right">
165+
<li><a href="bootstrap-navbar.html">Default</a></li>
166+
</ul>
167+
168+
</div><!--/.nav-collapse -->
169+
</div>
145170

146171

147172
{% include JB/analytics %}

assets/themes/lab/css/style.scss

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
---
22
---
33

4-
// start content
5-
// font-family: 'Open Sans', sans-serif;
64
$font-stack: 'Open Sans', sans-serif;
7-
$font-size-base: 12;
5+
$font-size-base: 12px;
86
$primary-color: #000000;
97

108
body {
@@ -36,6 +34,7 @@ h3,
3634
h4,
3735
h5,
3836
h6 {
37+
font-family: $font-stack;
3938
font-weight: 300;
4039
}
4140

@@ -54,6 +53,7 @@ h6 {
5453

5554
body {
5655
font-weight: 300;
56+
margin-bottom: 60px;
5757
}
5858

5959
p {
@@ -181,3 +181,7 @@ strong {
181181
journal {
182182
font-style: italic;
183183
}
184+
185+
.shortref {
186+
font-style: italic;
187+
}

index.html

+5
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,11 @@
118118
<a class="off" href="{{ paper.url }}">
119119
{{ paper.title }}
120120
</a>
121+
<p>
122+
<div class='shortref'>
123+
{{ paper.shortref }}
124+
</div>
125+
</p>
121126
</div>
122127
<div class="smallspacer"></div>
123128
<div class="smallnote">

0 commit comments

Comments
 (0)