Merge branch 'master' of https://github.com/LukeShu/leaguer

1 files changed, 10 insertions, 6 deletions

diff --git a/app/assets/stylesheets/application/scaffolds.css.scss b/app/assets/stylesheets/application/scaffolds.css.scss
index ae26907..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%;
 		}
 	}
@@ -115,6 +115,10 @@ fieldset {
 	}
 }
 
+form ul {
+	list-style: none;
+}
+
 a, button, input[type="submit"] {
 	@extend .btn;
 	&.user { @extend .btn-info; }
@@ -144,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;
 }
@@ -153,7 +157,7 @@ select {
 	background-color: #333;
 	padding: 5px;
 	border: none;
-	color: $orange !important;
+	color: $orange;
 }
 
 pre {