Permalink
Browse files

Better reset, keeping user's formatting in notes

  • Loading branch information...
1 parent 1a16fa0 commit b14fb5287d885b2d43192c88067cbe53eee1c130 myfreeweb committed Feb 21, 2011
Showing with 27 additions and 9 deletions.
  1. +1 −1 views/header.haml
  2. +26 −8 views/screen.sass
View
@@ -4,7 +4,7 @@
%nav
%strong= @user.email
%a{:href => "/settings"} settings
- %a{:href => "/logout"} log out
+ %a{:href => "/logout"} log out
- if flash[:error]
%div.flash.error= flash[:error]
- if flash[:info]
View
@@ -1,5 +1,19 @@
-@import compass/reset
-@import compass/reset/utilities
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary
+ margin: 0
+ padding: 0
+ border: 0
+
+article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary
+ display: block
+
@import compass/utilities
@import compass/utilities/general/min
@import compass/utilities/general/clearfix
@@ -11,13 +25,12 @@
@import compass/css3/border-radius
@import compass/css3/gradient
-+reset-html5
-
$sidepad: 2em
$col: #e80556
body
font: 16px "Helvetica Neue", sans-serif
+ vertical-align: baseline
a
+link-colors($col, lighten($col, 25%), saturate($col, 40%))
@@ -30,6 +43,7 @@ body > header
overflow: hidden
h1
float: left
+ font-size: 1em
nav
text-align: right
width: 100%
@@ -54,6 +68,11 @@ body > header
label:after
content: ":"
+#body
+ p, h1, h2, h3, h4, h5, h6, blockquote, ul
+ margin-bottom: 1em
+ ul
+ margin-left: 2em
#page
#wrapper
+display-box
@@ -63,6 +82,7 @@ label:after
margin: 2em $sidepad 0
nav
+box-flex(1)
+ min-width: 25%
input
width: 50%
ul
@@ -71,9 +91,7 @@ label:after
+unstyled-link
article
line-height: 1.35em
- +box-flex(4)
- p
- margin-bottom: 1em
+ +box-flex(5)
textarea
display: block
width: 90%
@@ -84,7 +102,7 @@ label:after
header
text-align: right
border-bottom: #a2a2a2 dashed 1px
- margin-bottom: 0.65em
+ margin-bottom: 1.25em
+clearfix
h1
float: left

0 comments on commit b14fb52

Please sign in to comment.