diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs index 293032b6..9bf2cd0a 100644 --- a/yesod/Scaffolding/Scaffolder.hs +++ b/yesod/Scaffolding/Scaffolder.hs @@ -149,8 +149,8 @@ scaffold = do $(codegen "hamlet/default-layout.hamlet") writeFile' "hamlet/boilerplate-layout.hamlet" $(codegen "hamlet/boilerplate-layout.hamlet") - writeFile' "static/css/normalize.css" - $(codegen "static/css/normalize.css") + writeFile' "lucius/normalize.lucius" + $(codegen "lucius/normalize.lucius") writeFile' "hamlet/homepage.hamlet" $ ifTiny $(codegen "tiny/hamlet/homepage.hamlet") $(codegen "hamlet/homepage.hamlet") writeFile' "config/routes" $ ifTiny $(codegen "tiny/config/routes") $(codegen "config/routes") writeFile' "cassius/homepage.cassius" $(codegen "cassius/homepage.cassius") diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg index 1aa391c1..42d81293 100644 --- a/yesod/scaffold/Foundation.hs.cg +++ b/yesod/scaffold/Foundation.hs.cg @@ -84,6 +84,7 @@ instance Yesod ~sitearg~ where mmsg <- getMessage pc <- widgetToPageContent $ do widget + addLucius $(luciusFile "normalize") addCassius $(cassiusFile "default-layout") hamletToRepHtml $(hamletFile "default-layout") diff --git a/yesod/scaffold/hamlet/boilerplate-layout.hamlet.cg b/yesod/scaffold/hamlet/boilerplate-layout.hamlet.cg index 522df932..22a5aca4 100644 --- a/yesod/scaffold/hamlet/boilerplate-layout.hamlet.cg +++ b/yesod/scaffold/hamlet/boilerplate-layout.hamlet.cg @@ -15,7 +15,6 @@ #{pageTitle pc} - <link rel="stylesheet" href=@{StaticR css_normalize_css}> ^{pageHead pc} <!--[if lt IE 9]> diff --git a/yesod/scaffold/hamlet/default-layout.hamlet.cg b/yesod/scaffold/hamlet/default-layout.hamlet.cg index 0a4d08f4..f31acb19 100644 --- a/yesod/scaffold/hamlet/default-layout.hamlet.cg +++ b/yesod/scaffold/hamlet/default-layout.hamlet.cg @@ -2,7 +2,6 @@ <html <head <title>#{pageTitle pc} - <link rel="stylesheet" href=@{StaticR css_normalize_css}> ^{pageHead pc} <body $maybe msg <- mmsg diff --git a/yesod/scaffold/static/css/normalize.css.cg b/yesod/scaffold/lucius/normalize.lucius.cg similarity index 100% rename from yesod/scaffold/static/css/normalize.css.cg rename to yesod/scaffold/lucius/normalize.lucius.cg diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg index 58bb57c9..1f4262dc 100644 --- a/yesod/scaffold/tiny/Foundation.hs.cg +++ b/yesod/scaffold/tiny/Foundation.hs.cg @@ -71,6 +71,7 @@ instance Yesod ~sitearg~ where mmsg <- getMessage pc <- widgetToPageContent $ do widget + addLucius $(luciusFile "normalize") addCassius $(cassiusFile "default-layout") hamletToRepHtml $(hamletFile "default-layout") diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index 9b13dcdf..7fc47113 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -30,7 +30,7 @@ extra-source-files: scaffold/tiny/Handler/Root.hs.cg scaffold/tiny/config/routes.cg scaffold/tiny/Settings.hs.cg - scaffold/static/css/normalize.css.cg + scaffold/lucius/normalize.lucius.cg scaffold/postgresqlConnPool.cg scaffold/sqliteConnPool.cg scaffold/.ghci.cg