From 0989181973e968ea5fcd7351584ce88bd42b6049 Mon Sep 17 00:00:00 2001
From: mb863 <mb863@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 16 Dec 2010 22:12:03 +0000
Subject: [PATCH] NIHVIVO-1072:  Doing testing in different browsers and fixing
 layout issues.

---
 themes/vivo-basic/css/screen.css |  9 ++++++++
 themes/wilma/css/ie6.css         | 38 +++++++++++++++++---------------
 themes/wilma/css/ie7.css         | 10 +++++----
 themes/wilma/css/wilma.css       | 15 +++++++------
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/themes/vivo-basic/css/screen.css b/themes/vivo-basic/css/screen.css
index 5562b1b3..53974950 100644
--- a/themes/vivo-basic/css/screen.css
+++ b/themes/vivo-basic/css/screen.css
@@ -15,6 +15,15 @@
 @import url("institution.css");
 @import url("individual.css");
 
+header,
+hgroup,
+section,
+nav,
+article,
+aside,
+footer {
+    display: block;
+}
 body {
   position: relative;
   background: #596673;
diff --git a/themes/wilma/css/ie6.css b/themes/wilma/css/ie6.css
index 4c53998d..0e75d4e2 100644
--- a/themes/wilma/css/ie6.css
+++ b/themes/wilma/css/ie6.css
@@ -5,37 +5,40 @@ body {
     background-position: center, 0;
     background-repeat: no-repeat;
 }
-#intro h3 { 
+#wrapper-content{
+    padding-left: 10px;
+    padding-right: 10px;
+}
+#intro h2 { 
     margin-left: 24px; 
-    }
+}
 #intro p { 
     margin-left: 24px; 
-    }
-#log-in { 
-    margin-right: 20px; 
-    }
+}
 #search-home h3 { 
     margin-left: 0; 
-    }
-#log-in input {
-    width: 200px;
-    margin-left: -28px;
 }
-ul#browse-classGroups { 
+#search-field .submit {
+    padding-left: 14px;
+}
+#search-home-field  input.submit {
+    padding-left: 14px;
+}
+ul#browse-classgroups { 
     margin-left: 20px; 
-    }
+}
 #browse-classes { 
     width: 600px; 
-    }
+}
 .global-highlights {
     width: 220px;
     padding: 18px;
 }
-ul#browse-classGroups a.selected {
+ul#browse-classgroups a.selected {
     background-position-x: 0;
     background-position-y: 12px;
 }
-/* fix for menupages */
+/* Fix for menupages */
 ul#foaf-person-childClasses {
     float: left;
     width: 265px;
@@ -49,7 +52,7 @@ ul#browse-childClasses {
 }
 #individuals-in-childClass { 
     width: 450px; 
-    }
+}
 #individuals-in-childClass h3 {
     padding: 10px 0 10px 30px;
     margin: 0;
@@ -62,5 +65,4 @@ article.individual-foaf-person {
 }
 #profile-photo-display { 
     width: 620px;
-}
-
+}
\ No newline at end of file
diff --git a/themes/wilma/css/ie7.css b/themes/wilma/css/ie7.css
index d481735b..f0c97121 100644
--- a/themes/wilma/css/ie7.css
+++ b/themes/wilma/css/ie7.css
@@ -1,6 +1,8 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
-/* fix for homepage */
-#log-in input {
-    width: 200px;
-    margin-left: -24px;
+/* Fix for homepage */
+#search-field .submit {
+    padding-left: 14px;
+}
+#search-home-field  input.submit {
+    padding-left: 14px;
 }
\ No newline at end of file
diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css
index dec9d914..91b06a5d 100644
--- a/themes/wilma/css/wilma.css
+++ b/themes/wilma/css/wilma.css
@@ -8,14 +8,14 @@ section,
 nav,
 article,
 aside,
-footer {
+footer{
     display: block;
 }
-time {
+time{
     font-weight: normal;
 }
 html,
-body {
+body{
     margin: 0;
     padding: 0;
     height: 100%; /* needed for container min-height */
@@ -97,7 +97,7 @@ ul#header-nav li {
     display: block;
     padding-left: 10px;
     padding-right: 10px;
-    border-right: 1px solid grey;
+    border-right: 1px solid #fff;
     font-size: 0.7em;
     color: #fff;
 }
@@ -123,7 +123,7 @@ ul#header-nav  a:active {
 .loginIcon {
     font-family: 'Pictos';
     font-size: 1.8em;
-    line-height: 0.2em;
+    line-height: .2em;
     color: #fff;
 }
 /* SEARCH ------>  */
@@ -207,7 +207,7 @@ ul#main-nav {
     min-height: 450px;
     padding: 20px;
 }
-/* INTRO ------>  */
+/* INTRO-BLURB ------>  */
 #intro {
     float: left;
     width: 570px;
@@ -380,7 +380,7 @@ p.password-note{
     color: #fff;
     font-size: 18px;
     border: none;
-    padding-left: 20px;
+    padding-left: 23px;
     padding-top: 8px;
     cursor: pointer;
 }
@@ -648,6 +648,7 @@ p.summary time {
     height: 35px;
     background: url(../images/icon-pub.png) 0 0 no-repeat;
     padding-bottom: 10px;
+    float: left;
 }
 p.publication-content {
     padding-left: 40px;