diff --git a/themes/wilma/css/transition/holdover-vivobasic/screen.css b/themes/wilma/css/transition/holdover-vivobasic/screen.css index 9e013c02..1f62f46d 100644 --- a/themes/wilma/css/transition/holdover-vivobasic/screen.css +++ b/themes/wilma/css/transition/holdover-vivobasic/screen.css @@ -34,6 +34,8 @@ body { background: #fff; font-size: 108.33%; /* bumping up content text from 12px to 13px */ min-height:350px; + width: 946px; + margin: 0 auto; } #footer { diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index bae2f2a4..d2046609 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -20,20 +20,14 @@ body { padding: 0; height: 100%; /* needed for container min-height */ background: #f3f3f0 url(../images/header-background.png) center 0 no-repeat; - font-family: "museo-sans-1", "museo-sans-2", helvetica, sans-serif, arial; /*font-size: 62.5%;*/ - /* Consider these fonts: "Lucida Sans Unicode","Lucida Grande",Geneva,*/ ; -} -/* PAGE WRAPPER ------> */ -#wrapper { - position: relative; /* needed for footer positioning*/ - /*margin:0 auto; center, not in IE5 */ - width: 970px; + font-family: "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif; + /*font-size: 62.5%;*/ + height: auto !important; /* real browsers */ height: 100%; /* IE6: treaded as min-height*/; min-height: 100%; /* real browsers */ margin: 0 auto; } - /* HEADER ------> */ #branding { position: relative; @@ -587,7 +581,7 @@ p.publication-content span { font-weight: normal; } /* FOOTER------> */ -#footer-content { +footer { clear: both; width: 970px; height: 88px; @@ -596,7 +590,7 @@ p.publication-content span { color: #4e5051; background-color: #fff; } -#footer-content p.copyright { +footer p.copyright { float: left; padding-top: 55px; padding-left: 30px; diff --git a/themes/wilma/templates/edit/formPrefix.jsp b/themes/wilma/templates/edit/formPrefix.jsp index 2747aeaf..ff708107 100644 --- a/themes/wilma/templates/edit/formPrefix.jsp +++ b/themes/wilma/templates/edit/formPrefix.jsp @@ -103,7 +103,6 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); " /> -
${ftl_menu}
\ No newline at end of file diff --git a/themes/wilma/templates/footer.ftl b/themes/wilma/templates/footer.ftl index dabf5920..67c2db2b 100644 --- a/themes/wilma/templates/footer.ftl +++ b/themes/wilma/templates/footer.ftl @@ -2,7 +2,6 @@ <#-- This is a temporary file and will be removed once we have completed the transition to freemarker -->
-
<#if copyright??>

©${copyright.year?c} <#if copyright.url??> @@ -22,10 +21,9 @@

  • Support
    • -
    -
    + ${scripts.add("/js/jquery.js")} ${scripts.tags} diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl index 91ab4ff3..abc1f247 100644 --- a/themes/wilma/templates/page-home.ftl +++ b/themes/wilma/templates/page-home.ftl @@ -29,7 +29,6 @@ -
    -
    <#if copyright??>

    ©${copyright.year?c} <#if copyright.url??> @@ -233,9 +231,7 @@

  • Support
    • -
    -
    ${scripts.add("/js/jquery.js")} ${scripts.tags} diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl index 9719a513..f062ea89 100644 --- a/themes/wilma/templates/page.ftl +++ b/themes/wilma/templates/page.ftl @@ -24,7 +24,6 @@ -
    -
    <#if copyright??>

    ©${copyright.year?c} <#if copyright.url??> @@ -103,9 +101,7 @@

  • Support
    • -
    -
    ${scripts.add("/js/jquery.js")} ${scripts.tags} diff --git a/themes/wilma/templates/page/basicPage.jsp b/themes/wilma/templates/page/basicPage.jsp index 060cf937..9762bc1c 100644 --- a/themes/wilma/templates/page/basicPage.jsp +++ b/themes/wilma/templates/page/basicPage.jsp @@ -102,7 +102,7 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); -
    + ${ftl_menu}