From 6ae7160cb231aaec95ef8daa1e70bfb7081ce7e1 Mon Sep 17 00:00:00 2001 From: Greg Weber Date: Thu, 11 Aug 2011 07:06:42 -0700 Subject: [PATCH] upgrade to html5boilerplate 2 mostly just use normalize.css now --- yesod/scaffold.hs | 4 +- .../hamlet/boilerplate-layout.hamlet.cg | 10 +- .../static/css/html5boilerplate.css.cg | 116 -- yesod/scaffold/static/css/normalize.css | 1453 +++++++++++++++++ 4 files changed, 1462 insertions(+), 121 deletions(-) delete mode 100644 yesod/scaffold/static/css/html5boilerplate.css.cg create mode 100644 yesod/scaffold/static/css/normalize.css diff --git a/yesod/scaffold.hs b/yesod/scaffold.hs index 50955cd7..7bb164d7 100644 --- a/yesod/scaffold.hs +++ b/yesod/scaffold.hs @@ -165,8 +165,8 @@ scaffold = do $(codegen "hamlet/default-layout.hamlet") writeFile' "hamlet/boilerplate-layout.hamlet" $(codegen "hamlet/boilerplate-layout.hamlet") - writeFile' "static/css/html5boilerplate.css" - $(codegen "static/css/html5boilerplate.css") + writeFile' "static/css/normalize.css" + $(codegen "static/css/normalize.css") 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/hamlet/boilerplate-layout.hamlet.cg b/yesod/scaffold/hamlet/boilerplate-layout.hamlet.cg index 4e59cda3..8150c9a5 100644 --- a/yesod/scaffold/hamlet/boilerplate-layout.hamlet.cg +++ b/yesod/scaffold/hamlet/boilerplate-layout.hamlet.cg @@ -25,6 +25,10 @@ + normalize.css at master from necolas/normalize.css - GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Markdown Cheat Sheet

+ +
+ +
+
+

Format Text

+

Headers

+ 
+# This is an <h1> tag
+## This is an <h2> tag
+###### This is an <h6> tag
+

Text styles

+ 
+*This text will be italic*
+_This will also be italic_
+**This text will be bold**
+__This will also be bold__
+
+*You **can** combine them*
+
+
+
+

Lists

+

Unordered

+ 
+* Item 1
+* Item 2
+  * Item 2a
+  * Item 2b
+

Ordered

+ 
+1. Item 1
+2. Item 2
+3. Item 3
+   * Item 3a
+   * Item 3b
+
+
+

Miscellaneous

+

Images

+ 
+![GitHub Logo](/images/logo.png)
+Format: ![Alt Text](url)
+
+

Links

+ 
+http://github.com - automatic!
+[GitHub](http://github.com)
+

Blockquotes

+ 
+As Kanye West said:
+> We're living the future so
+> the present is our past.
+
+
+
+
+ +

Code Examples in Markdown

+
+

Syntax highlighting with GFM

+ 
+```javascript
+function fancyAlert(arg) {
+  if(arg) {
+    $.facebox({div:'#foo'})
+  }
+}
+```
+
+
+

Or, indent your code 4 spaces

+ 
+Here is a Python code example
+without syntax highlighting:
+
+    def foo:
+      if not bar:
+        return true
+
+
+

Inline code for comments

+ 
+I think you should use an
+`<addr>` element here instead.
+
+
+ +
+ + + + + + + + + + + + + +