From 25ee24c0acc5379b2ca0a37e607f39dde6cbb8f8 Mon Sep 17 00:00:00 2001
From: mb863 <mb863@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 20 Dec 2010 21:04:45 +0000
Subject: [PATCH] NIHVIVO-1559: Done more work on this issue. I think it looks
 pretty good.

---
 productMods/edit/forms/css/customForm.css |  2 ++
 themes/wilma/css/edit.css                 | 12 +++++++++---
 themes/wilma/css/screen.css               |  2 --
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/productMods/edit/forms/css/customForm.css b/productMods/edit/forms/css/customForm.css
index b2214d9a..b61539fe 100644
--- a/productMods/edit/forms/css/customForm.css
+++ b/productMods/edit/forms/css/customForm.css
@@ -65,6 +65,8 @@ form.customForm p {
     /*margin-bottom: 1em;*/
     margin-top: 0;
     padding-top: 0;
+    margin-bottom: 0;
+    padding-bottom: 0;
 }
 
 option {
diff --git a/themes/wilma/css/edit.css b/themes/wilma/css/edit.css
index fbb01fab..36ae7148 100644
--- a/themes/wilma/css/edit.css
+++ b/themes/wilma/css/edit.css
@@ -33,7 +33,7 @@ input#submit:visited{
     font-weight: normal;
     line-height: 1;
     margin-right: .6em;
-    margin-top: 1em;
+    margin-top: .5em;
 }
 input#delete,
 input#delete:visited{
@@ -194,9 +194,15 @@ p.submit {
 }
 .formsEdit p{
     /*padding-top: 1em;*/
-    margin-bottom: 0;
+    margin-bottom: 1.8em;
     padding-bottom: 0;
-    margin-top: .7em;
+    margin-top: 0;
+}
+.formsEdit p.validationError{
+    margin-bottom: 1.8em;
+    margin-top: 0;
+    padding-top: 0;
+    font-size: .8em;
 }
 form.deleteForm{
     margin-top: 2em;
diff --git a/themes/wilma/css/screen.css b/themes/wilma/css/screen.css
index 29b96174..99afb25c 100644
--- a/themes/wilma/css/screen.css
+++ b/themes/wilma/css/screen.css
@@ -24,8 +24,6 @@ VIVO wilma theme: screen styles
 @import url("transition/holdover-vivobasic/screen.css");
 
 @import url("reset.css");
-@import url("edit.css");
 @import url("pictos.css");
-/*@import url("formedit.css");  mb863 move the content of formedit.css to edit.css in vitro */
 @import url("edit.css");
 @import url("wilma.css");
\ No newline at end of file