diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 17:46:20 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 17:46:20 -0500 |
commit | 19b135ec55e040c78009400f389d19ae58cc628c (patch) | |
tree | 6494c92a75f7c28f64bee81f2ed9a4eca8b7c28f | |
parent | 6d48e4641520ce03796e5b9edd258f704cee3e82 (diff) | |
parent | 6b27e11f1613967d2b97b0eead6cf06263e6140b (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
-rw-r--r-- | app/assets/stylesheets/custom.css.scss | 21 | ||||
-rw-r--r-- | app/assets/stylesheets/scaffolds.css.scss | 4 | ||||
-rw-r--r-- | app/views/layouts/application.html.erb | 7 |
3 files changed, 23 insertions, 9 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index a8a8e68..faecdce 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -4,7 +4,20 @@ header > nav { @extend .navbar; @extend .navbar-inverse; color: white; -} -header > nav > #log-buttons{ - margin-top: 8px; -} + + #log-buttons { + margin-top: 8px; + } + .signup { + @extend .btn; + @extend .btn-success; + } + .signin { + @extend .btn; + @extend .btn-info; + } + .signout { + @extend .btn; + @extend .btn-danger; + } + }
\ No newline at end of file diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index f705417..2c8c009 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: #666; + color: white; } &:hover { - color: #000; + color: white; text-decoration: none; } } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6fdbbec..093f31a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -20,10 +20,11 @@ <div id="log-buttons"> <% if signed_in? %> <%= current_user.user_name.upcase %> - <button type="button" class="btn btn-danger" ><%= link_to "Sign out", session_path("current"), method: "delete" %></button> + <%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout", :role => "button" %> <% else %> - <button type="button" class="btn btn-info" ><%= link_to "Log in", new_session_path %></button> - <button type="button" class="btn btn-success"><%= link_to "Sign up", new_user_path %></button> + <%= link_to "Log in", new_session_path, :class => "signin", :role => "button" %> + <%= link_to "Sign up", new_user_path, :class => "signup", :role => "button" + %> <% end %> </div> </nav></header> |