Skip to content

Commit f08169b

Browse files
committed
Load font-awesome in a more natural manner with Sprockets
Start sprocketsing an application.js
1 parent e4031af commit f08169b

File tree

11 files changed

+18
-42
lines changed

11 files changed

+18
-42
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ GEM
7676
sexp_processor (~> 4.0)
7777
ruby_parser (3.6.2)
7878
sexp_processor (~> 4.1)
79-
sass (3.4.3)
79+
sass (3.4.4)
8080
sexp_processor (4.4.4)
8181
sinatra (1.4.5)
8282
rack (~> 1.4)

app.rb

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
require "deck"
2121
require "deck/rack_app"
2222
require "titleizer"
23-
require "asset_compiler"
2423
require "site"
2524
require 'sprockets'
2625

@@ -35,6 +34,7 @@ class InstallFest < Sinatra::Application # todo: use Sinatra::Base instead, wi
3534

3635
set :assets, Sprockets::Environment.new
3736
settings.assets.append_path "assets/stylesheets"
37+
settings.assets.append_path "assets/javascripts"
3838

3939
configure do
4040
I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
@@ -176,14 +176,13 @@ def render_deck
176176
halt 404
177177
end
178178

179-
get "/assets/:file.css" do
180-
content_type "text/css"
181-
settings.assets["#{params[:file]}.css"]
182-
end
183-
184-
get '/font-awesome.css' do
185-
content_type 'text/css'
186-
AssetCompiler.instance.font_awesome
179+
get "/assets/:file.:ext" do
180+
mime_type = {
181+
'js' => 'application/javascript',
182+
'css' => 'text/css'
183+
}[params[:ext]]
184+
content_type mime_type if mime_type
185+
settings.assets["#{params[:file]}.#{params[:ext]}"]
187186
end
188187

189188
get '/fonts/font-awesome/:file' do

assets/javascripts/application.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
//= require 'doc_page'
File renamed without changes.

assets/stylesheets/application.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
//= require 'big_checkbox'
44
//= require 'header'
55
//= require 'toc'
6-
//= require 'step'
6+
//= require 'step'
7+
//= require 'font_awesome'
8+
//= require 'coderay'
File renamed without changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
$fa-font-path: '/fonts/font-awesome/';
2+
3+
@import 'font-awesome';

lib/asset_compiler.rb

Lines changed: 0 additions & 22 deletions
This file was deleted.

lib/doc_page.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ def head_content
1616
title page_title
1717
script :src => "/jquery.min.js"
1818
script :src => "/js/bootstrap.min.js"
19-
script :src => "/js/doc_page.js"
20-
link :href => "/font-awesome.css", :rel => "stylesheet"
19+
script :src => "/assets/application.js"
2120
link :href => "/assets/application.css", :rel => "stylesheet"
2221
end
2322

@@ -38,7 +37,6 @@ def page_title
3837
external :style, <<-CSS
3938
@import url(http://github.com/fonts/opensans.css);
4039
@import url(http://github.com/fonts/aleo.css);
41-
@import url(http://github.com/css/coderay.css);
4240
CSS
4341

4442
class TopLink < Erector::Widget

lib/erector_scss.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
require 'sass'
2-
require_relative 'asset_compiler'
32

43
class Erector::Widget
54
def self.scss content
65
Sass.compile(content)
76
end
8-
9-
def self.file_scss path
10-
AssetCompiler.instance.file_scss(path)
11-
end
127
end
138

0 commit comments

Comments
 (0)