summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguntasgrewal <guntasgrewal@gmail.com>2014-03-04 17:44:40 -0500
committerguntasgrewal <guntasgrewal@gmail.com>2014-03-04 17:44:40 -0500
commit489a9f7291b6b7c1143bb482f637020d82f944d5 (patch)
tree7b9e7f1aba5e7d472f9ea270762246911bd3cff8
parent4050ce81532a65883cbadbfc17c21d05d67061ba (diff)
Buttons fixed
-rw-r--r--app/assets/stylesheets/custom.css.scss21
-rw-r--r--app/assets/stylesheets/scaffolds.css.scss4
-rw-r--r--app/views/layouts/application.html.erb7
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 39b6845..252cb2b 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>