From 4aef638a9866c432e981fc8fe87869e6642c54ab Mon Sep 17 00:00:00 2001
From: mb863 <mb863@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 2 Dec 2010 22:46:06 +0000
Subject: [PATCH] NIHVIVO-1238: Continue working on styles and making custom
 forms theme agnostic

---
 themes/wilma/css/edit.css     | 64 ++++++++++++++++++++++++++++++++---
 themes/wilma/css/formedit.css | 10 ------
 themes/wilma/css/screen.css   |  5 +--
 themes/wilma/css/wilma.css    |  4 +--
 4 files changed, 64 insertions(+), 19 deletions(-)
 delete mode 100644 themes/wilma/css/formedit.css

diff --git a/themes/wilma/css/edit.css b/themes/wilma/css/edit.css
index 83caa526..8a7d8b02 100644
--- a/themes/wilma/css/edit.css
+++ b/themes/wilma/css/edit.css
@@ -3,12 +3,66 @@
 
 /******************* mb863: willma styles ********************************/
 
-label{
-    display: block; 
-    margin-top: .5em; 
-}
 input{
-    padding:0;
+    border: 0;
+    font-size: 14px;
+    padding: 10px;
+    background: #fff;
+    border: 1px solid #e0dfdf;
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px; 
 }
 
+input#submit{
+    background: #222 url(../images/alert-overlay.png) repeat-x;
+    display: inline-block;
+    padding: 7px 22px 8px;
+    color: #fff;
+    text-decoration: none;
+    border-radius: 4px; 
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    position: relative;
+    cursor: pointer;
+    border: 0;
+    margin:0;
+    margin-top:1.2em;
+    background-color: #749a02;
+    color: #fff;
+    font-size: 16px;
+    font-weight: normal;
+    line-height: 1;
+}
 
+/* STYLED BUTTONS ------>  
+p input#submit,
+p input#submit:visited {
+    background: #222 url(../images/alert-overlay.png) repeat-x;
+    display: inline-block;
+    padding: 7px 22px 8px;
+    color: #fff;
+    text-decoration: none;
+    border-radius: 4px; 
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    position: relative;
+    cursor: pointer;
+    border: 0;
+    margin:0;
+    height: 24px;
+    background-color: #749a02;
+    color: #fff;
+    font-size: 16px;
+    font-weight: normal;
+    line-height: 1; 
+}
+p input#submit:hover {
+    background-color: #111;
+    color: #fff;
+    background-color: #b2d15a;
+}
+p input#submit:active {
+    top: 1px;
+}
+*/
diff --git a/themes/wilma/css/formedit.css b/themes/wilma/css/formedit.css
deleted file mode 100644
index a2b4c0d4..00000000
--- a/themes/wilma/css/formedit.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-/*************************************************
-This styles will change for wilma theme.
-
-wilma theme: editing form styles copied from vivo-basic
- 
-This document is included by formPrefix.jsp
- 
-
diff --git a/themes/wilma/css/screen.css b/themes/wilma/css/screen.css
index e5c08df6..29b96174 100644
--- a/themes/wilma/css/screen.css
+++ b/themes/wilma/css/screen.css
@@ -26,5 +26,6 @@ VIVO wilma theme: screen styles
 @import url("reset.css");
 @import url("edit.css");
 @import url("pictos.css");
-@import url("wilma.css");
-/*@import url("formedit.css");  mb863 move the content of formedit.css to edit.css in vtiro */
+/*@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
diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css
index 26c3deef..a403e2f6 100644
--- a/themes/wilma/css/wilma.css
+++ b/themes/wilma/css/wilma.css
@@ -365,13 +365,13 @@ p.password-note{
     height: 44px;
     background: url(../images/search-field-and-button.png) 0 0 no-repeat;
 }
-#search-home-field  .submit {
+#search-home-field  input.submit {
     text-decoration: none;
     background-color: transparent;
     color: #fff;
     font-size: 18px;
     border: none;
-    padding-left: 40px;
+    padding-left: 20px;
     padding-top: 8px;
     cursor: pointer;
 }