From 48a7a656f7d87316d204a81b6ea80b33539c384f Mon Sep 17 00:00:00 2001
From: mb863 <mb863@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 19 Nov 2010 20:55:19 +0000
Subject: [PATCH] Worked on styling login widget for Wilma theme

---
 themes/wilma/css/formedit.css        |  9 ++--
 themes/wilma/css/wilma.css           | 72 +++++++++++++++++++---------
 themes/wilma/templates/page-home.ftl |  2 +-
 3 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/themes/wilma/css/formedit.css b/themes/wilma/css/formedit.css
index 4c58b591..0997ed06 100644
--- a/themes/wilma/css/formedit.css
+++ b/themes/wilma/css/formedit.css
@@ -1,9 +1,11 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
 /*************************************************
- vivo-basic theme: editing form styles
+This styles will change for wilma theme.
+
+wilma theme: editing form styles copied from vivo-basic
  
- This document is included by formPrefix.jsp
+This document is included by formPrefix.jsp
  
 **************************************************/
 
@@ -25,8 +27,7 @@ form a:link.cancel, form a:visited.cancel {
 }
 
 form a:hover.cancel {
-    color: #fff;
-    background: #f70;
+    text-decoration: none;
 }
 
 form select option{
diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css
index fccd12e6..950ee9a4 100644
--- a/themes/wilma/css/wilma.css
+++ b/themes/wilma/css/wilma.css
@@ -216,36 +216,54 @@ ul#main-nav {
     font-size: 14px;
     color: #b2d15a;
 }
-/* LOG IN------>  */            
-#log-in {
-    width:314px;
-    height:390px;
-    border:1px solid #e8ece9;
-    margin-right:25px;
-    margin-top:20px;
-    padding-bottom:30px;
-    margin-bottom:30px;
-}
+/* LOG IN------>  */
 /* Login container on home page */
 #login-container {
     float: right;
+}            
+#log-in-form {
+    width:314px;
+    border:1px solid #e8ece9;
+    margin-right:25px;
+    padding-bottom:10px;
+    margin-bottom:30px;
+    overflow:hidden;
 }
-#log-in h2 {
+#log-in-form h2 {
     font-size: 22px;
     color: #2485ae;
     padding-left:15px;
     padding-top:18px;
     border-bottom:none;
 }
-#log-in label {
+#errorAlert {
+    padding:12px 10px 10px 10px;
+    width:294px;
+    border-top:1px dotted #a12424;
+    border-left:1px dotted #a12424;
+    border-right:1px dotted #a12424;
+}
+#errorAlert img {
+    float:left;
+    margin:0;
+    padding:0;
+    vertical-align:middle;
+}
+#errorAlert p {
+    padding-left:40px;
+    font-size:0.9em;
+    line-height: 1.3em;
+    color:#a12424;
+    padding-top:5px;
+}
+#log-in-form label {
     display:block;
-    font-size: 14px;
     color: #5e6363;
     padding-top:20px;
     padding-left:38px;
     font-size:14px;
 }
-#log-in input.text-field {
+#log-in-form input.text-field {
     border:0;
     font-size:14px;
     padding:5px;
@@ -259,18 +277,22 @@ ul#main-nav {
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;     
 }
-#log-in input.text-field:focus {
+#log-in-form input.text-field:focus {
 border:1px solid rgba(57, 138, 172, 0.5);  
 background-color: rgba(57, 138, 172, 0.1);   
 }
-#log-in p.submit {
+#log-in-form p.submit {
     width:100px;
     height:40px;
     margin-top:20px;
     margin-left:38px;
-    float:left;
 }
-#log-in input.checkbox-remember-me {
+#log-in-form p.submit-password{
+    height:40px;
+    margin-top:20px;
+    margin-left:38px;
+}
+#log-in-form input.checkbox-remember-me {
     float:left;
     height:14px;
     width:14px;
@@ -279,7 +301,7 @@ background-color: rgba(57, 138, 172, 0.1);
     margin-top:33px;
     margin-left:20px;
 }
-#log-in .label-remember-me {
+#log-in-form label.label-remember-me {
     display:block;
     float:right;
     color: #5e6363;
@@ -287,14 +309,15 @@ background-color: rgba(57, 138, 172, 0.1);
     width:100px;
     margin:0;
     padding:0;
-    margin-top:30px;
-    margin-right:25px;
-    padding-right:10px;
+    margin-top:29px;
+    margin-right:32px;
 }
 p.forgot-password {
     clear:both;
     margin-left:38px;
     font-size:12px;
+    padding-top:1.2em;
+    padding-bottom:1.2em;
 }
 p.forgot-password a {
     color: #2485ae;
@@ -311,6 +334,11 @@ p.request-account {
 p.request-account a{
     color:#fff;
 }
+p.passwordNote{
+    font-size: 12px;
+    color: #949696;
+    padding-left:38px;   
+}
 /* HOME SEARCH ------>  */
 #search-home {
     float: left;
diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl
index 0962396b..e89f9635 100644
--- a/themes/wilma/templates/page-home.ftl
+++ b/themes/wilma/templates/page-home.ftl
@@ -92,7 +92,7 @@
             </#if>
         
             <section id="intro" role="region">
-                <h3>What is VIVO?</h3>
+                <h2>What is VIVO?</h2>
                 
                 <p>VIVO is an open source semantic web application originally developed and implemented at Cornell. When installed and populated with researcher interests, activities, and accomplishments, it enables the discovery of research and scholarship across disciplines at that institution. VIVO supports browsing and a search function which returns faceted results for rapid retrieval of desired information. Content in any local VIVO installation may be maintained manually,  brought into VIVO in automated ways from local systems of record, such as HR, grants, course, and faculty activity databases, or from database providers such as publication aggregators and funding agencies. <a href="#">More<span class="pictos-arrow-14"> 4</span></a></p>
                 <section id="search-home" role="region">