Skip to content

Commit

Permalink
Added handheld. Adjusted asset_packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Alberto Perdomo committed Oct 11, 2010
1 parent fcf8a50 commit 9285ce6
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 11 deletions.
7 changes: 3 additions & 4 deletions application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@
-# %link{ :href => "/apple-touch-icon.png", :rel => "apple-touch-icon" }/

%title= "[Default title] #{yield(:title)}"
= raw stylesheet_link_merged('screen', :media => 'screen, projection')
= raw stylesheet_link_merged('print', :media => 'print')
/[if lt IE 8]
= raw stylesheet_link_merged('ie', :media => 'screen, projection')
= raw stylesheet_link_merged('screen')
-# For the less-enabled mobile browsers like Opera Mini
= raw stylesheet_link_merged('handheld', :media => 'handheld')
= csrf_meta_tag
%body{ :class => "#{controller.controller_name}" }
#container
Expand Down
7 changes: 2 additions & 5 deletions asset_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ javascripts:
- base:
- rails
stylesheets:
- ie:
- ie
- screen:
- grid
- text
- print:
- grid
- text
- handheld:
- handheld
8 changes: 8 additions & 0 deletions handheld.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
* {
float: none; // Screens are not big enough to account for floats
background: #fff; // As much contrast as possible */
color: #000;
}

// Slightly reducing font size to reduce need to scroll
body { font-size: 80%; }
6 changes: 4 additions & 2 deletions main.rb
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,14 @@

generate "friendly_id"
generate "formtastic:install"

# compass
run "gem install compass"
run "compass init -r ninesixty --using 960 --app rails --css-dir public/stylesheets"
create_file "app/stylesheets/_colors.scss"
run "rm public/stylesheets/*"
get "http://github.com/activestylus/formtastic-sass/raw/master/_formtastic_base.sass", "app/stylesheets/_formtastic_base.sass"
get "http://github.com/aentos/rails3-templates/raw/master/handheld.scss" ,"app/stylesheets/handheld.scss"

unless locale_str.empty?
locales = locale_str.split(",")
Expand All @@ -103,7 +107,6 @@
end

# formtastic sass mixins
get "http://github.com/activestylus/formtastic-sass/raw/master/_formtastic_base.sass", "app/stylesheets/_formtastic_base.sass"

# jquery
get "http://github.com/rails/jquery-ujs/raw/master/src/rails.js", "public/javascripts/rails.js"
Expand All @@ -112,7 +115,6 @@

plugin 'annote_models', :git => "http://github.com/justinko/annotate_models.git"

# TODO: default stylesheets: screen & print
get "http://github.com/aentos/rails3-templates/raw/master/application.html.haml", "app/views/layouts/application.html.haml"
get "http://github.com/aentos/rails3-templates/raw/master/build.rake", "lib/tasks/build.rake"
get "http://github.com/aentos/rails3-templates/raw/master/asset_packages.yml", "config/asset_packages.yml"
Expand Down

0 comments on commit 9285ce6

Please sign in to comment.