diff options
author | nfoy <nfoy@purdue.edu> | 2014-04-28 19:57:02 -0400 |
---|---|---|
committer | nfoy <nfoy@purdue.edu> | 2014-04-28 19:57:02 -0400 |
commit | 3ab30900798a838b399d06f28251b6cdd82a94de (patch) | |
tree | b0e5ba4dee18ad9fc0902a1969fdaf9e9306d1f9 /app/assets/stylesheets | |
parent | d5d480bc0a98eb3532ce0a6567585b791e44db07 (diff) | |
parent | a81ca51690e81444ecb87435ef29195b1e017f68 (diff) |
Fixed the db/seeds merge conflict
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/application/scaffolds.css.scss | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/stylesheets/application/scaffolds.css.scss b/app/assets/stylesheets/application/scaffolds.css.scss index 703e3d6..4f0c781 100644 --- a/app/assets/stylesheets/application/scaffolds.css.scss +++ b/app/assets/stylesheets/application/scaffolds.css.scss @@ -39,9 +39,6 @@ html { form.search { @extend .navbar-form; float: right; - input[type="submit"] { - @extend .btn-warning; - } input[type="text"], input[type="search"] { background-color: #303030; border: 2px solid #ED9C28; @@ -51,6 +48,9 @@ html { height: 30px; padding: 0px 5px; } + input[type="submit"] { + @extend .btn-warning; + } } } @@ -77,7 +77,7 @@ html { clear: both; border-top: solid 1px $orange; text-align: center; - margin: 0 auto; + margin: 1em auto 0; width: 90%; } } @@ -148,7 +148,7 @@ input, textarea{ border: 3px inset #A5A5A5; padding: 8px; - color: $orange !important; + color: $orange; background: rgba(0,0,0,0.5); margin: 0 0 5px 0; } @@ -157,7 +157,7 @@ select { background-color: #333; padding: 5px; border: none; - color: $orange !important; + color: $orange; } pre { |