Skip to content

Commit f8868b3

Browse files
author
Matt Swanson
committed
backout asset-pack until I can figure it out on heroku with backbone and underscore.
1 parent 0947e3b commit f8868b3

File tree

9 files changed

+11
-48
lines changed

9 files changed

+11
-48
lines changed

‎Gemfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ gem "sinatra"
44
gem "sinatra-activerecord"
55
gem "sinatra-flash"
66
gem "sinatra-contrib", github: "sinatra/sinatra-contrib"
7-
gem "sinatra-assetpack", :require => "sinatra/assetpack"
87
gem "i18n"
98

109
gem "rake"
@@ -19,8 +18,6 @@ gem "feedbag", github: "dwillis/feedbag"
1918

2019
gem "coveralls", require: false
2120

22-
gem "uglifier"
23-
2421
group :production do
2522
gem "unicorn"
2623
gem "pg"

‎Gemfile.lock‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,12 @@ GEM
6262
diff-lcs (1.2.4)
6363
dotenv (0.7.0)
6464
eventmachine (1.0.3)
65-
execjs (1.4.0)
66-
multi_json (~> 1.0)
6765
faker (1.1.2)
6866
i18n (~> 0.5)
6967
foreman (0.63.0)
7068
dotenv (>= 0.7)
7169
thor (>= 0.13.6)
7270
i18n (0.6.4)
73-
jsmin (1.0.1)
7471
kgio (2.8.0)
7572
loofah (1.2.1)
7673
nokogiri (>= 1.4.4)
@@ -121,22 +118,13 @@ GEM
121118
sinatra-activerecord (1.2.2)
122119
activerecord (~> 3.0)
123120
sinatra (~> 1.0)
124-
sinatra-assetpack (0.2.2)
125-
backports
126-
jsmin
127-
rack-test
128-
sinatra
129-
tilt (>= 1.3.0)
130121
sinatra-flash (0.3.0)
131122
sinatra (>= 1.0.0)
132123
slop (3.4.4)
133124
sqlite3 (1.3.7)
134125
thor (0.18.1)
135126
tilt (1.4.1)
136127
tzinfo (0.3.37)
137-
uglifier (2.1.0)
138-
execjs (>= 0.3.0)
139-
multi_json (~> 1.0, >= 1.0.2)
140128
unicorn (4.6.2)
141129
kgio (~> 2.6)
142130
rack
@@ -167,10 +155,8 @@ DEPENDENCIES
167155
shotgun
168156
sinatra
169157
sinatra-activerecord
170-
sinatra-assetpack
171158
sinatra-contrib!
172159
sinatra-flash
173160
sqlite3
174-
uglifier
175161
unicorn
176162
will_paginate

‎app.rb‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
require "sinatra/activerecord"
33
require "sinatra/flash"
44
require "sinatra/contrib/all"
5-
require "sinatra/assetpack"
65
require "json"
76
require "i18n"
87
require "will_paginate"
@@ -18,7 +17,6 @@ class Stringer < Sinatra::Base
1817
set :database_file, "config/database.yml"
1918
set :views, "app/views"
2019
set :public_dir, "app/public"
21-
set :root, File.dirname(__FILE__)
2220

2321
enable :sessions
2422
set :session_secret, ENV["SECRET_TOKEN"] || "secret!"
@@ -27,37 +25,10 @@ class Stringer < Sinatra::Base
2725
register Sinatra::ActiveRecordExtension
2826
register Sinatra::Flash
2927
register Sinatra::Contrib
30-
register Sinatra::AssetPack
3128

3229
ActiveRecord::Base.include_root_in_json = false
3330
end
3431

35-
assets {
36-
serve "/js", from: "app/public/js"
37-
serve "/css", from: "app/public/css"
38-
serve "/img", from: "app/public/img"
39-
serve "/fonts", from: "app/public/fonts"
40-
41-
js :application, "/js/application.js", [
42-
"/js/jquery-1.9.1.min.js",
43-
"/js/mousetrap.min.js",
44-
"/js/bootstrap.min.js",
45-
"/js/underscore-min.js",
46-
"/js/backbone-min.js",
47-
"/js/app.js"
48-
]
49-
50-
css :application, "/css/application.css", [
51-
"/css/bootstrap.min.css",
52-
"/css/flat-ui-no-icons.css",
53-
"/css/font-awesome.min.css",
54-
"/css/styles.css"
55-
]
56-
57-
js_compression :uglify
58-
css_compression :simple
59-
}
60-
6132
helpers do
6233
include Sinatra::AuthenticationHelpers
6334

app/public/css/bootstrap.min.css renamed to app/public/css/bootstrap-min.css

File renamed without changes.

app/public/css/font-awesome.min.css renamed to app/public/css/font-awesome-min.css

File renamed without changes.

app/public/js/bootstrap.min.js renamed to app/public/js/bootstrap-min.js

File renamed without changes.

app/public/js/jquery-1.9.1.min.js renamed to app/public/js/jquery-min.js

File renamed without changes.

app/public/js/mousetrap.min.js renamed to app/public/js/mousetrap-min.js

File renamed without changes.

‎app/views/layout.erb‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,17 @@
99
<link rel="shortcut icon" href="/img/favicon.png">
1010
<link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,900,400italic" rel="stylesheet" type="text/css">
1111

12-
<%= css :application %>
13-
<%= js :application %>
12+
<link rel="stylesheet" type="text/css" href="/css/bootstrap-min.css">
13+
<link rel="stylesheet" type="text/css" href="/css/flat-ui-no-icons.css">
14+
<link rel="stylesheet" type="text/css" href="/css/font-awesome-min.css">
15+
<link rel="stylesheet" type="text/css" href="/css/styles.css">
16+
17+
<script type="text/javascript" src="/js/jquery-min.js"></script>
18+
<script type="text/javascript" src="/js/mousetrap-min.js"></script>
19+
<script type="text/javascript" src="/js/bootstrap-min.js"></script>
20+
<script type="text/javascript" src="/js/underscore-min.js"></script>
21+
<script type="text/javascript" src="/js/backbone-min.js"></script>
22+
<script type="text/javascript" src="/js/app.js"></script>
1423

1524
<%= yield_content :head %>
1625
</head>

0 commit comments

Comments
 (0)