From 0b9460c1af2619a6158141b01ba77836cc8a9e74 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 5 Mar 2014 20:12:56 -0500 Subject: simplify with css more --- app/assets/stylesheets/custom.css.scss | 8 +++++++- app/assets/stylesheets/scaffolds.css.scss | 12 ++++++++++-- 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 @@