summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-03-04 18:58:02 -0500
committerAndrewMurrell <amurrel@purdue.edu>2014-03-04 18:58:02 -0500
commite1d73b277cbc55615d10dbb842480f970ae5a538 (patch)
treefe1d9c291a2e5338ddbdb56163e15fa8a687b67f /app
parente586c3e2b30698ea5a1c83c19ea446c4be89fd54 (diff)
parentaebb2153938d884ac2c2f3516f682c987b4805ca (diff)
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/scaffolds.css.scss4
-rw-r--r--app/views/layouts/application.html.erb2
2 files changed, 3 insertions, 3 deletions
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;
}
}
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 39d73dd..75a9d4e 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,7 +9,7 @@
</head>
<body>
<header><nav>
- <div class="navbar-brand no-dec"><%= link_to('Leaguer', root_path, nil) %></div>
+ <div class="navbar-brand no-dec"><%= link_to('Leaguer', root_path, :style => "color:white") %></div>
<div>
<%= form_tag("/search", method: "get", :class => "navbar-form navbar-right") do %>
<%= text_field_tag(:query, nil, :placeholder => "Search") %>