diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:52:43 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:52:43 -0500 |
| commit | ad24f46d94ad94003da412eb98d763c7a2beb863 (patch) | |
| tree | ec56fd2ece1f18931733569ffb72a10672c5b6c2 | |
| parent | 2eb8e1c090071abf3108828efc831f12128e17df (diff) | |
| parent | 4050ce81532a65883cbadbfc17c21d05d67061ba (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
| -rw-r--r-- | app/assets/stylesheets/application.css | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/custom.css.scss | 6 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 13 |
3 files changed, 15 insertions, 8 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 896d7c1..b3f5d46 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -19,5 +19,7 @@ color: #FFF; font-weight: bold; height: 30px; - +} +.navbar{ + background-color: white; } diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index 25cac21..a8a8e68 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -1,6 +1,10 @@ @import "bootstrap"; header > nav { - @extend .navbar; + @extend .navbar; @extend .navbar-inverse; + color: white; +} +header > nav > #log-buttons{ + margin-top: 8px; } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d817484..6fdbbec 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -16,15 +16,16 @@ <%= submit_tag("Go", {:class => "btn btn-warning"}) %> <% end %> </div> - <ul> + + <div id="log-buttons"> <% if signed_in? %> - <li><%= current_user.user_name.upcase %></li> - <li><%= link_to "Sign out", session_path("current"), method: "delete" %></li> + <%= current_user.user_name.upcase %> + <button type="button" class="btn btn-danger" ><%= link_to "Sign out", session_path("current"), method: "delete" %></button> <% else %> - <li><%= link_to "Log in", new_session_path %></li> - <li><%= link_to "Sign up", new_user_path %></li> + <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> <% end %> - </ul> + </div> </nav></header> <% if notice %><div id="notice"><p><%= notice %></p></div><% end %> |