From ed08113669550ff3d7d542411cda935da5d54047 Mon Sep 17 00:00:00 2001
From: mb863 <mb863@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 2 Dec 2010 22:45:51 +0000
Subject: [PATCH] NIHVIVO-1238: Continue working on styles and making custom
 forms theme agnostic

---
 webapp/web/css/edit.css                       | 32 ++++++-------------
 .../freemarker/page/partials/stylesheets.ftl  |  2 +-
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/webapp/web/css/edit.css b/webapp/web/css/edit.css
index 2afbe39c7..6a5894911 100644
--- a/webapp/web/css/edit.css
+++ b/webapp/web/css/edit.css
@@ -6,64 +6,52 @@ label{
     display: block; 
     margin-top: .5em; 
 }
-input{
-    padding:0.4em;
-}
 
 
-
-/******************* mb863: content below copied from Wilma theme /css/formedit.css ********************************/
+/*************************************************
+ vivo-basic theme: editing form styles
+ 
+ This document is included by formPrefix.jsp
+ 
+**************************************************/
 
 form {
     padding-bottom: 20px;
 }
-
 .form p {
     margin-bottom:0.5em;
 }
-
 form textarea {
     width: 60%;
 }
-
 form a:link.cancel, form a:visited.cancel {
     color: #f70;
     border-color: #f70;
 }
-
 form a:hover.cancel {
-    text-decoration: none;
+    color: #fff;
+    background: #f70;
 }
-
 form select option{
     padding-right: 5px;
 }
-
 form dl {
     margin-bottom: 20px;
 }
-
 form dl dt, form dl dd {
     padding-top: 15px;
 }
-
 .validationError {
-    padding-top: .5em;
-    color:red;
+  color:red;
 }
-
 .inlineForm input {
   display:inline;
 }
-
 .inlineForm label {
   display:inline;
 }
 
-p.submit {
-  clear: left;
-  margin-top: 2em;
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
 /******************* styles copied from old global.css.jsp ********************************/
 
diff --git a/webapp/web/templates/freemarker/page/partials/stylesheets.ftl b/webapp/web/templates/freemarker/page/partials/stylesheets.ftl
index 990ad839f..f57129b2f 100644
--- a/webapp/web/templates/freemarker/page/partials/stylesheets.ftl
+++ b/webapp/web/templates/freemarker/page/partials/stylesheets.ftl
@@ -1,6 +1,6 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 <#-- Template for loading stylesheets in the head -->
-${stylesheets.add("/css/edit.css")} <#-- temporary until edit controller can include this when needed -->
+${stylesheets.add("/css/edit.css")} <#--temporary until edit controller can include this when needed -->
 ${stylesheets.add("/css/menupage/menupage.css")} <#-- we need to call it from the theme until freemarker controller and menupage.ftl are created -->
 ${stylesheets.add("/css/individual/individual.css")} <#-- we need to call it from the theme until freemarker controller and individual.ftl are created -->