NIHVIVO-556: page-ftl and page-homepage.ftp don't use any more a wrapper div. Also, HTML5 footer element is styling the footer of those templates. div#footer-content was styling the footer before and it has been deleted.
This commit is contained in:
mb863
parent
676baeb596
commit
9338e2ca0e
7 changed files with 9 additions and 24 deletions
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -103,7 +103,6 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
|
|||
<link rel="stylesheet" type="text/css" href="<c:url value="/js/jquery_plugins/thickbox/thickbox.css"/>" />
|
||||
</head>
|
||||
<body class="formsEdit">
|
||||
<div id="wrapper">
|
||||
${ftl_menu}
|
||||
<div id="content">
|
||||
<!-- end of formPrefix.jsp -->
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
<#-- This is a temporary file and will be removed once we have completed the transition to freemarker -->
|
||||
|
||||
<footer>
|
||||
<div id="footer-content">
|
||||
<#if copyright??>
|
||||
<p class="copyright"><small>©${copyright.year?c}
|
||||
<#if copyright.url??>
|
||||
|
|
@ -22,10 +21,9 @@
|
|||
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
</div> <!-- #footer-content -->
|
||||
</footer>
|
||||
|
||||
</div> <!-- #wrapper -->
|
||||
|
||||
|
||||
${scripts.add("/js/jquery.js")}
|
||||
${scripts.tags}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
</head>
|
||||
|
||||
<body>
|
||||
<div id="wrapper">
|
||||
<header id="branding">
|
||||
<h2 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2>
|
||||
<!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
|
||||
|
|
@ -214,7 +213,6 @@
|
|||
</section> <!-- $highlights -->
|
||||
</div> <!-- #wrapper-content -->
|
||||
<footer>
|
||||
<div id="footer-content">
|
||||
<#if copyright??>
|
||||
<p class="copyright"><small>©${copyright.year?c}
|
||||
<#if copyright.url??>
|
||||
|
|
@ -233,9 +231,7 @@
|
|||
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
</div> <!-- #footer-content -->
|
||||
</footer>
|
||||
</div> <!-- #wrapper -->
|
||||
|
||||
${scripts.add("/js/jquery.js")}
|
||||
${scripts.tags}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
<![endif]-->
|
||||
</head>
|
||||
<body>
|
||||
<div id="wrapper">
|
||||
<header id="branding">
|
||||
<h2 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2>
|
||||
<!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
|
||||
|
|
@ -84,7 +83,6 @@
|
|||
<#include bodyTemplate>
|
||||
</div> <!-- #wrapper-content -->
|
||||
<footer>
|
||||
<div id="footer-content">
|
||||
<#if copyright??>
|
||||
<p class="copyright"><small>©${copyright.year?c}
|
||||
<#if copyright.url??>
|
||||
|
|
@ -103,9 +101,7 @@
|
|||
<li><a href="http://www.vivoweb.org/support" target="blank">Support</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
</div> <!-- #footer-content -->
|
||||
</footer>
|
||||
</div> <!-- #wrapper -->
|
||||
|
||||
${scripts.add("/js/jquery.js")}
|
||||
${scripts.tags}
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
|
|||
</head>
|
||||
|
||||
<body ${requestScope.bodyAttr}>
|
||||
<div id="wrapper">
|
||||
|
||||
${ftl_menu}
|
||||
<div id="wrapper-content">
|
||||
<c:import url="${bodyJsp}"/>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue