Skip to content

Commit b544d7a

Browse files
committed
Updated to use Haml 3.1.1, Sass 3.1.1 and Compass 0.11.1. Dropped support for @media queries and updated the homepage content
1 parent c3d8b08 commit b544d7a

File tree

14 files changed

+292
-218
lines changed

14 files changed

+292
-218
lines changed

Gemfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
source 'http://rubygems.org'
22

3-
gem "serve", "~> 1.0.0"
4-
gem "grid-coordinates", "~> 1.1.4"
5-
gem "meyer-reset", "~> 2.0.0"
6-
gem "maruku", "~> 0.6.0"
3+
gem 'serve', '~> 1.0.0'
4+
gem 'haml', '~> 3.1.1'
5+
gem 'sass', '~> 3.1.1'
6+
gem 'compass', '~> 0.11.1'
7+
gem 'css_parser', '~> 1.1.9'
8+
gem 'grid-coordinates', '~> 1.1.4'
9+
gem 'meyer-reset', '~> 2.0.0'
10+
gem 'maruku', '~> 0.6.0'

Gemfile.lock

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,41 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
activesupport (3.0.1)
5-
compass (0.10.6)
6-
haml (>= 3.0.4)
4+
activesupport (3.0.7)
5+
chunky_png (1.1.2)
6+
compass (0.11.1)
7+
chunky_png (~> 1.1)
8+
fssm (>= 0.2.7)
9+
sass (~> 3.1)
10+
css_parser (1.1.9)
11+
fssm (0.2.7)
712
grid-coordinates (1.1.4)
813
compass (>= 0.10.5)
9-
haml (3.0.25)
14+
haml (3.1.1)
1015
i18n (0.4.2)
1116
maruku (0.6.0)
1217
syntax (>= 1.0.0)
1318
meyer-reset (2.0.0)
1419
compass (>= 0.10.5)
15-
rack (1.2.1)
20+
rack (1.2.2)
21+
sass (3.1.1)
1622
serve (1.0.0)
1723
activesupport (~> 3.0.1)
1824
i18n (~> 0.4.1)
1925
rack (~> 1.2.1)
2026
tzinfo (~> 0.3.23)
2127
syntax (1.0.0)
22-
tzinfo (0.3.23)
28+
tzinfo (0.3.27)
2329

2430
PLATFORMS
2531
ruby
2632

2733
DEPENDENCIES
34+
compass (~> 0.11.1)
35+
css_parser (~> 1.1.9)
2836
grid-coordinates (~> 1.1.4)
37+
haml (~> 3.1.1)
2938
maruku (~> 0.6.0)
3039
meyer-reset (~> 2.0.0)
40+
sass (~> 3.1.1)
3141
serve (~> 1.0.0)

config.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
# Set to true for easier debugging
1919
line_comments = false
20+
preferred_syntax = :sass
2021

2122
# CSS output style - :nested, :expanded, :compact, or :compressed
2223
output_style = :expanded

config.ru

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ root = ::File.dirname(__FILE__)
1414

1515
# Set the haml options
1616
# http://haml-lang.com/docs/yardoc/file.HAML_REFERENCE.html#options
17-
class Haml::Engine
18-
alias old_initialize initialize
19-
def initialize(lines, options)
20-
options.update(:format => :html5)
21-
old_initialize(lines, options)
22-
end
23-
end
17+
# class Haml::Engine
18+
# alias old_initialize initialize
19+
# def initialize(lines, options)
20+
# options.update(:format => :html5)
21+
# old_initialize(lines, options)
22+
# end
23+
# end
2424

2525
# Compass
2626
Compass.add_project_configuration(root + '/config.rb')

0 commit comments

Comments
 (0)