Skip to content

Commit

Permalink
#fixes 17 - enable normalize as default reset framework
Browse files Browse the repository at this point in the history
  • Loading branch information
mechanoid committed Jul 28, 2013
1 parent d98430c commit 1c856a0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

"framework": {
"core": "compass",
"reset": "compass/reset",
"reset": "normalize",
"css3": "compass/css3"
}
},
Expand Down
2 changes: 2 additions & 0 deletions lib/toppings.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# encoding: utf-8
require 'set'
require 'active_support/all'
require 'compass'
require 'compass-normalize'

module Toppings
SASS_DEPENDENCIES ||= Set.new
Expand Down
2 changes: 1 addition & 1 deletion spec/generators/install/root_file_generator_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
subject.should generate_valid_sass_file(stylesheets_path.join('toppings.sass')) { |content|
content.should include('@import "compass"')
content.should include('@import "compass/css3"')
content.should include('@import "compass/reset"')
content.should include('@import "normalize"')
}
end
end
Expand Down
1 change: 1 addition & 0 deletions toppings.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "thor", ">= 0.18.1"
spec.add_dependency "activesupport", ">= 3.2"
spec.add_dependency "compass", ">= 0.12.2"
spec.add_dependency "compass-normalize"
spec.add_dependency "susy", ">= 1.0.8"
spec.add_dependency "modular-scale"
end

0 comments on commit 1c856a0

Please sign in to comment.