Skip to content
This repository was archived by the owner on Oct 4, 2020. It is now read-only.

Commit 4479b2d

Browse files
committed
Use sprockets to serve assets.
1 parent 652b391 commit 4479b2d

21 files changed

+146
-9618
lines changed

Gemfile

+10-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,18 @@
22
source "https://rubygems.org"
33

44
gem "sinatra"
5-
gem "haml"
6-
gem "sinatra-assetpack"
5+
gem "sinatra-support"
76
gem "padrino-helpers"
7+
88
gem "sass"
9+
gem "haml"
10+
11+
gem 'sprockets'
12+
gem 'sprockets-helpers'
13+
gem 'sprockets-sass'
14+
15+
gem 'compass'
16+
gem 'bootstrap-sass', '~> 3.0.2.0'
917

1018
gem "treetop", "~> 1.4.14"
1119
gem "builder", "~> 3.2.2"

Gemfile.lock

+27-9
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,23 @@ GEM
44
activesupport (3.2.15)
55
i18n (~> 0.6, >= 0.6.4)
66
multi_json (~> 1.0)
7+
bootstrap-sass (3.0.2.1)
8+
sass (~> 3.2)
79
builder (3.2.2)
10+
chunky_png (1.2.9)
11+
compass (0.12.2)
12+
chunky_png (~> 1.2)
13+
fssm (>= 0.2.7)
14+
sass (~> 3.1)
815
diff-lcs (1.2.4)
16+
fssm (0.2.10)
917
haml (4.0.3)
1018
tilt
19+
hike (1.2.3)
1120
http_router (0.11.0)
1221
rack (>= 1.0.0)
1322
url_mount (~> 0.2.1)
1423
i18n (0.6.5)
15-
jsmin (1.0.1)
1624
log4r (1.1.10)
1725
mini_portile (0.5.1)
1826
multi_json (1.8.2)
@@ -32,8 +40,6 @@ GEM
3240
rack (1.5.2)
3341
rack-protection (1.5.1)
3442
rack
35-
rack-test (0.6.2)
36-
rack (>= 1.0)
3743
rspec (2.14.1)
3844
rspec-core (~> 2.14.0)
3945
rspec-expectations (~> 2.14.0)
@@ -49,11 +55,18 @@ GEM
4955
rack (~> 1.4)
5056
rack-protection (~> 1.4)
5157
tilt (~> 1.3, >= 1.3.4)
52-
sinatra-assetpack (0.3.1)
53-
jsmin
54-
rack-test
55-
sinatra
56-
tilt (>= 1.3.0)
58+
sinatra-support (1.2.2)
59+
sinatra (>= 1.0)
60+
sprockets (2.10.1)
61+
hike (~> 1.2)
62+
multi_json (~> 1.0)
63+
rack (~> 1.0)
64+
tilt (~> 1.1, != 1.3.0)
65+
sprockets-helpers (1.1.0)
66+
sprockets (~> 2.0)
67+
sprockets-sass (1.0.2)
68+
sprockets (~> 2.0)
69+
tilt (~> 1.1)
5770
thor (0.17.0)
5871
tilt (1.4.1)
5972
treetop (1.4.15)
@@ -66,7 +79,9 @@ PLATFORMS
6679
ruby
6780

6881
DEPENDENCIES
82+
bootstrap-sass (~> 3.0.2.0)
6983
builder (~> 3.2.2)
84+
compass
7085
haml
7186
log4r
7287
nokogiri (~> 1.6.0)
@@ -75,5 +90,8 @@ DEPENDENCIES
7590
sass
7691
shotgun
7792
sinatra
78-
sinatra-assetpack
93+
sinatra-support
94+
sprockets
95+
sprockets-helpers
96+
sprockets-sass
7997
treetop (~> 1.4.14)

0 commit comments

Comments
 (0)