diff options
Diffstat (limited to 'app/assets/stylesheets/scaffolds.css.scss')
| -rw-r--r-- | app/assets/stylesheets/scaffolds.css.scss | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 39b6845..566d05d 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -1,13 +1,16 @@ body { - background-color: #EEEEEE; + background-color: #fff; color: #333; font-family: verdana, arial, helvetica, sans-serif; font-size: 13px; line-height: 18px; +<<<<<<< HEAD +======= } h1, h2, h3, h4, h5{ color: #0f0f0f; +>>>>>>> aca85cf084702c29014a17eafb090421061fae8b } p, ol, ul, td { @@ -71,6 +74,8 @@ div { list-style: square; } } +<<<<<<< HEAD +======= hr { -moz-border-bottom-colors: none; @@ -97,3 +102,4 @@ hr { #footer{ text-align: center; } +>>>>>>> aca85cf084702c29014a17eafb090421061fae8b |