summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-03-04 19:04:36 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-03-04 19:04:36 -0500
commit6db29eb669a85e5b0aac7a1e8879781a1cb77772 (patch)
tree26114b3a2385a839220ef3e59dac65b561ca3793 /app/assets
parent40e0c9cf507dc27c9553af5ca962e3c65dc42780 (diff)
parente1d73b277cbc55615d10dbb842480f970ae5a538 (diff)
Merge branch 'master' of github.com:LukeShu/leager
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/ajax.js6
-rw-r--r--app/assets/stylesheets/scaffolds.css.scss4
2 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/ajax.js b/app/assets/javascripts/ajax.js
index 31578dd..040c100 100644
--- a/app/assets/javascripts/ajax.js
+++ b/app/assets/javascripts/ajax.js
@@ -12,4 +12,8 @@ function populate() {
;
}
};
-} \ No newline at end of file
+
+//$.ajax(url: "/selected").done (html) -> $("#ajax-form").append html
+
+}
+
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 2c8c009..e4b33b3 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -25,10 +25,10 @@ pre {
a {
color: #000;
&:visited {
- color: white;
+ color: #000;
}
&:hover {
- color: white;
+ color: green;
text-decoration: none;
}
}