diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-05 20:12:56 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-05 20:12:56 -0500 |
| commit | 0b9460c1af2619a6158141b01ba77836cc8a9e74 (patch) | |
| tree | 0612c07f26690ca40a4ff6d469ee4819af5f597c /app | |
| parent | a4b40b899bca6396eea63672590282c7011f386c (diff) | |
simplify with css more
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/custom.css.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/scaffolds.css.scss | 12 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 6 |
3 files changed, 20 insertions, 6 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index 3c9aef9..d4c81a0 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -16,6 +16,13 @@ header > nav { &.signout { @extend .btn-danger; } } } + form.search { + @extend .navbar-form; + @extend .navbar-right; + input[type="submit"] { + @extend .btn-warning; + } + } } p.errors { @@ -38,4 +45,3 @@ p.errors { } } - diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 28761fc..6700fef 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -1,3 +1,5 @@ +@import "bootstrap"; + body { background-color: #fff; color: #333; @@ -74,9 +76,11 @@ div { } .navbar-brand { + @extend .no-dec; a{ - &:hover { - color: #FFF; + color: white; + &:hover, &:active, &:focus { + color: white; font-weight: normal; text-decoration: none; } @@ -89,3 +93,7 @@ footer { padding-top: 18px; margin-top: 18px; } + +button, input[type="submit"] { + @extend .btn; +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8c54c64..7578d82 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,11 +9,11 @@ </head> <body> <header><nav> - <div class="navbar-brand no-dec"><%= link_to('Leaguer', root_path, :style => "color:white") %></div> + <div class="navbar-brand"><%= link_to('Leaguer', root_path) %></div> <div> - <%= form_tag("/search", method: "get", :class => "navbar-form navbar-right") do %> + <%= form_tag("/search", method: "get", :class => "search") do %> <%= text_field_tag(:query, nil, :placeholder => "Search") %> - <%= submit_tag("Go", {:class => "btn btn-warning"}) %> + <%= submit_tag("Go") %> <% end %> </div> |