2 files changed, 42 insertions, 2 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 0599a93..489914b 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -7,6 +7,44 @@ header > nav {
 
 	#log-buttons {
 		margin-top: 8px;
+<<<<<<< HEAD
+	}
+	.signup {
+		@extend .btn;
+		@extend .btn-success;
+	}
+	.signin {
+		@extend .btn;
+		@extend .btn-info;
+	}
+	.signout {
+		@extend .btn;
+		@extend .btn-danger;
+	}
+}
+
+p.errors {
+	background-color: #FCF8C7;
+	color: red;
+	border-radius: 7px;
+	padding: 10px;
+}
+
+#errorExplanation {
+	h2 {
+		font-size: 1em;
+		color: red;
+		font-weight: bold;
+	}
+	li {
+		font-size: 1em;
+		color: red;
+		font-style: italic;  
+	}
+
+}
+
+=======
 		form { display: inline; }
 		a, input[type="submit"] {
 			@extend .btn;
@@ -17,3 +55,4 @@ header > nav {
 		}
 	}
 }
+>>>>>>> 6db29eb669a85e5b0aac7a1e8879781a1cb77772
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index e4b33b3..07c7676 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -44,8 +44,9 @@ div {
 }
 
 .field_with_errors {
-  padding: 2px;
-  background-color: red;
+  padding: 1px;
+  background-color: #FF4C4C;
+  box-shadow: 0px 0px 5px red;
   display: table;
 }