From 7e971dbef374ed31ba723fb0263501f915614023 Mon Sep 17 00:00:00 2001 From: mb863 Date: Mon, 17 Jan 2011 16:29:30 +0000 Subject: [PATCH] NIHVIVO-1710: Fixed spacing for additional links --- webapp/web/css/individual/individual.css | 12 ++++++------ .../body/partials/individual/lib-properties.ftl | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/webapp/web/css/individual/individual.css b/webapp/web/css/individual/individual.css index d1a4ab87b..a8be80c81 100644 --- a/webapp/web/css/individual/individual.css +++ b/webapp/web/css/individual/individual.css @@ -93,10 +93,11 @@ div.bottom{ } #share-contact h3{ margin-top: 15px; - padding-bottom: 0; - line-height: .6em; + padding-bottom: .3em; + font-size: 1em; + line-height: 1.2em; } -#share-contact img.individual-photo2{ +#share-contact img.individual-photo{ width: 160px; height: 160px; float: left; @@ -176,14 +177,13 @@ ul.individual-urls li a{ } ul.individual-urls-people{ clear: both; - margin-top: 20px; list-style: none; list-style-type: circle; padding-left: 24px; } ul.individual-urls-people li{ font-size: .875em; - line-height: 1.2em; + line-height: 1.3em; } /* <------ INDIVIDUAL RIGHT CONTENT */ #individual-info{ @@ -352,7 +352,7 @@ article.property ul.property-list li{ } article.property ul.subclass-property-list{ margin-left: 0; -} +}#share-contact h3 article.property ul.subclass-property-list li{ line-height: 1.2em; padding: 0 20px 10px 20px; diff --git a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl index 069725d05..186570071 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl @@ -118,12 +118,12 @@ name will be used as the label. --> <#-- Don't assume that if the mainImage property is populated, there is a thumbnail image (though that is the general case). If there's a mainImage statement but no thumbnail image, treat it as if there is no image. --> <#if (mainImage.statements)?has_content && thumbUrl?has_content> - ${individual.name} + ${individual.name} <@p.editingLinks mainImage.statements[0] showEditLinks /> <#else> <@p.addLinkWithLabel mainImage showEditLinks "Photo" /> <#if placeholderImage?has_content> - placeholder image + placeholder image