Skip to content

Commit 031bd9e

Browse files
committed
Bump foundation to latest (+last) 4.x release + add JS bits #57
1 parent e1e85f8 commit 031bd9e

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ source 'https://rubygems.org'
22

33
gem 'rake', '~> 10.0.3'
44
gem 'sass', '~> 3.2.5'
5-
gem 'zurb-foundation', '~> 4.0.5', require: false
6-
5+
gem 'jquery-middleman', require: false
6+
gem 'zurb-foundation', '~> 4.3.2', require: false
77
gem 'middleman', '~> 3.2.0'
88
gem 'middleman-deploy', '~> 1.0'
99
gem 'builder'

Gemfile.lock

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ GEM
3232
hike (1.2.3)
3333
i18n (0.6.11)
3434
icalendar (2.4.1)
35+
jquery-middleman (3.1.2)
36+
thor (>= 0.14, < 2.0)
3537
json (2.1.0)
3638
kramdown (1.16.2)
3739
listen (1.3.1)
@@ -110,7 +112,7 @@ GEM
110112
uglifier (2.4.0)
111113
execjs (>= 0.3.0)
112114
json (>= 1.8.0)
113-
zurb-foundation (4.0.9)
115+
zurb-foundation (4.3.2)
114116
sass (>= 3.2.0)
115117

116118
PLATFORMS
@@ -121,6 +123,7 @@ DEPENDENCIES
121123
coffee-script
122124
html5-boilerplate!
123125
icalendar
126+
jquery-middleman
124127
middleman (~> 3.2.0)
125128
middleman-deploy (~> 1.0)
126129
nokogiri
@@ -133,7 +136,7 @@ DEPENDENCIES
133136
redcarpet
134137
sass (~> 3.2.5)
135138
sitemap_generator
136-
zurb-foundation (~> 4.0.5)
139+
zurb-foundation (~> 4.3.2)
137140

138141
BUNDLED WITH
139142
1.16.0

source/javascripts/application.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1+
//= require jquery
2+
//= require foundation/foundation
3+
//= require foundation/foundation.topbar
14

5+
$(document).ready(function() {
6+
$(document).foundation();
7+
});

source/layout.haml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
%link(href="apple-touch-icon-114x114-precomposed.png" sizes="114x114" rel="apple-touch-icon")
1515

1616
= stylesheet_link_tag 'normalize', 'app'
17+
= javascript_include_tag 'application'
18+
1719
= partial 'partials/analytics'
1820

1921
%body(class="#{current_page.data.body_class}")

0 commit comments

Comments
 (0)