diff options
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/images/.keep | 0 | ||||
-rw-r--r-- | app/assets/javascripts/application.js | 16 | ||||
-rw-r--r-- | app/assets/stylesheets/scaffolds.css.scss | 8 |
3 files changed, 7 insertions, 17 deletions
diff --git a/app/assets/images/.keep b/app/assets/images/.keep deleted file mode 100644 index e69de29..0000000 --- a/app/assets/images/.keep +++ /dev/null diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js deleted file mode 100644 index d6925fa..0000000 --- a/app/assets/javascripts/application.js +++ /dev/null @@ -1,16 +0,0 @@ -// This is a manifest file that'll be compiled into application.js, which will include all the files -// listed below. -// -// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, -// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. -// -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// compiled file. -// -// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details -// about supported directives. -// -//= require jquery -//= require jquery_ujs -//= require turbolinks -//= require_tree . 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 |