Permalink
Browse files

New updates for Compass, layouts, and some organization

  • Loading branch information...
1 parent fbd773b commit 39e00b53ae895c8575172c3e2099e7c912f85ce7 Adam Stacoviak committed Nov 19, 2010
Showing with 27 additions and 8 deletions.
  1. +3 −3 app.rb
  2. +5 −0 views/_nav_main.haml
  3. +2 −1 views/layouts/application.haml
  4. +14 −3 views/layouts/page.haml
  5. +3 −1 views/stylesheets/application.sass
View
6 app.rb
@@ -17,14 +17,14 @@
# Configure Compass
configure do
- Compass.configuration.parse(File.join(Sinatra::Application.root, 'config.rb'))
+ Compass.add_project_configuration(File.join(Sinatra::Application.root, 'config.rb'))
end
# At a minimum the main sass file must reside within the views directory
# We create /views/stylesheets where all our sass files can safely reside
-get '/stylesheets/:name.css' do
+get '/stylesheets/:file.css' do
content_type 'text/css', :charset => 'utf-8'
- sass(:"stylesheets/#{params[:name]}", Compass.sass_engine_options)
+ sass(:"stylesheets/#{params[:file]}", Compass.sass_engine_options)
end
get '/about' do
View
@@ -0,0 +1,5 @@
+%ul
+ %li
+ %a{:href => "/"} Home
+ %li
+ %a{:href => "/about"} About
@@ -1,4 +1,4 @@
-!!! Strict
+!!! 5
%html{html_attrs('en-en')}
%head
%meta{:'http-equiv' => "Content-Type", :content => "text/html; charset=utf-8"}
@@ -9,5 +9,6 @@
%script{:type => "text/javascript", :src => "javascripts/plugins/jquery.qtip-1.0.0-rc3.min.js"}
%script{:type => "text/javascript", :src => "javascripts/site.js"}
%body
+ = partial :_nav_main
= yield
= partial :_analytics
View
@@ -1,3 +1,14 @@
-%p This is the 'alternate.haml'
-
-= yield
+!!! 5
+%html{html_attrs('en-en')}
+ %head
+ %meta{:'http-equiv' => "Content-Type", :content => "text/html; charset=utf-8"}
+ %meta{:name => "lang", :content => "en"}
+ %title Sinatra Bootstrap
+ %link{:href=>'stylesheets/application.css', :rel => 'stylesheet', :media => "screen", :type => "text/css"}
+ %script{:type => "text/javascript", :src => "http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"}
+ %script{:type => "text/javascript", :src => "javascripts/plugins/jquery.qtip-1.0.0-rc3.min.js"}
+ %script{:type => "text/javascript", :src => "javascripts/site.js"}
+ %body
+ = partial :_nav_main
+ = yield
+ = partial :_analytics
@@ -1,5 +1,7 @@
-@import blueprint/reset
+@import compass/reset
+@include reset-html5
@import compass/utilities
+@import compass/css3
// Base font
=base-font

0 comments on commit 39e00b5

Please sign in to comment.