diff --git a/frameworks/blueprint/templates/project/manifest.rb b/frameworks/blueprint/templates/project/manifest.rb index 853b59b7..fa700632 100644 --- a/frameworks/blueprint/templates/project/manifest.rb +++ b/frameworks/blueprint/templates/project/manifest.rb @@ -4,3 +4,5 @@ stylesheet 'print.sass', :media => 'print' stylesheet 'ie.sass', :media => 'screen, projection', :condition => "lt IE 8" image 'grid.png' + +html 'welcome.html.haml', :erb => true diff --git a/frameworks/blueprint/templates/project/screen.sass b/frameworks/blueprint/templates/project/screen.sass index d3d9be68..87b36a52 100644 --- a/frameworks/blueprint/templates/project/screen.sass +++ b/frameworks/blueprint/templates/project/screen.sass @@ -38,3 +38,10 @@ body.three-col !content_columns = ceil(2 * !blueprint_grid_columns / 3) // true means it's the last column in the row +column(!content_columns, true) + +// This is just here to style the welcome page, please delete it. +body#welcome + #container + +container + h1 + +column(24) \ No newline at end of file diff --git a/frameworks/blueprint/templates/project/welcome.html.haml b/frameworks/blueprint/templates/project/welcome.html.haml index ed7c989d..460eac03 100644 --- a/frameworks/blueprint/templates/project/welcome.html.haml +++ b/frameworks/blueprint/templates/project/welcome.html.haml @@ -3,10 +3,11 @@ %html(xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en") %head %title Welcome to Compass & Blueprint - %link(rel="stylesheet" href="stylesheets/screen.css" type="text/css" media="screen, projection") - %link(href="stylesheets/print.css" media="print" rel="stylesheet" type="text/css") + %link(rel="stylesheet" href="<%= http_stylesheets_path %>/screen.css" type="text/css" media="screen, projection") + %link(href="<%= http_stylesheets_path %>/print.css" media="print" rel="stylesheet" type="text/css") /[if lt IE 8] - %link(href="stylesheets/ie.css" media="screen, projection" rel="stylesheet" type="text/css") + %link(href="<%= http_stylesheets_path %>/ie.css" media="screen, projection" rel="stylesheet" type="text/css") %body#welcome.bp #container - %h1 Welcome to Compass! \ No newline at end of file + %h1 Welcome to Compass! + %p This is <%= "ERB" %> \ No newline at end of file