diff --git a/wise-webapp/src/main/webapp/css/mindmapList.less b/wise-webapp/src/main/webapp/css/mindmapList.less index e153bb90..f112fc50 100644 --- a/wise-webapp/src/main/webapp/css/mindmapList.less +++ b/wise-webapp/src/main/webapp/css/mindmapList.less @@ -5,15 +5,7 @@ @html-background: #dedederepeat-xscroll; @body-width: 1050px; -@font-family: "Lucida Grande", -"Arial" -, -"Helvetica" -, -"Verdana" -, -"sans-serif" -; +@font-family: "Lucida Grande","Arial","Helvetica","Verdana","sans-serif"; @base-font-size: 11px; @base-margin: 10px; @@ -171,11 +163,6 @@ input#selectAll { white-space: nowrap; } - -#foldersContainer { - padding-top: 60px; -} - span.starredOff { background: url('../images/star-off.png') no-repeat center left; padding: 10px; @@ -199,3 +186,19 @@ span.starredOn:hover { abbr[title] { cursor: default; } + + +#footerContainer { + padding-top: 10px; + border-top: 1px black solid; + position: absolute; + bottom: 0; + left: 0; + width: 100%; + height: 65px; /* Height of the footer */ + background: #ffffff; +} + +#foldersContainer { + padding-top: 60px; +} \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css index 641973c7..daf1faaa 100644 --- a/wise-webapp/src/main/webapp/css/pageHeaders.css +++ b/wise-webapp/src/main/webapp/css/pageHeaders.css @@ -1,6 +1,13 @@ /* HEADER STYLES */ + +html,body { + margin: 0; + padding: 0; + height: 100%; +} + #header { - margin-top: 0px; + margin-top: 0; height: 78px; width: 100%; background: white; @@ -99,17 +106,6 @@ div#headerButtons activelink a, div#headerButtons activelink a:hover { border-bottom: 0; } -#footer { - border-top: 1px black solid; - padding-top: 15px; - width: 100%; - background: #ffffff; -} - -div#paypal { - float: left; - margin: -29px; -} #headerLogo { cursor: pointer; @@ -131,16 +127,3 @@ div#headerActions { div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited { color: white; } - -div.header_languages { - position: absolute; - right: 0; - top: 30px; - width: 100px; - height: 20px; -} - -div.header_language_flag { - float: left; - margin-right: 3px; -} \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css index 38b53706..d4ef5c81 100644 --- a/wise-webapp/src/main/webapp/css/pageTemplate.css +++ b/wise-webapp/src/main/webapp/css/pageTemplate.css @@ -1,12 +1,7 @@ @import "../bootstrap/css/bootstrap.min.css"; @import "../bootstrap/css/bootstrap-responsive.min.css"; - @import "pageHeaders.css"; -html, body { - height: 100%; -} - div#register { margin: 40px auto; text-align: center; @@ -18,83 +13,53 @@ div#register a { font-weight: bold; } - -div.pageBodyContent ol { - margin-left: 12px; +div#pageContainer { + position: relative; + min-height: 100%; } -div.pageBodyContent ul { - list-style-position: outside; -} - -div.pageBodyContent ol li { - list-style-type: decimal; -} - - -div.pageBody { - min-height: 80%; -} - -div.pageBodyContent { +div.bodyContainer { padding-top: 30px; + padding-bottom: 85px; /* Height of the footer */ } -div.pageBodyContent h1 { +div.bodyContainer h1 { color: #093A9D; font-size: 150%; margin-bottom: 5px; font-weight: bold; } -div.pageBodyContent h2 { +div.bodyContainer h2 { color: gray; font-size: 150%; border-bottom: 1px dashed #BBB4D6; margin: 20px 0; } -div.pageBodyContent ul { +div.bodyContainer ul { padding: 5px; } -div.pageBodyContent li { +div.bodyContainer li { list-style-type: disc; margin-left: 12px; } +#footerContainer { + padding-top: 10px; + border-top: 1px black solid; + position: absolute; + bottom: 0; + left: 0; + width: 100%; + height: 65px; /* Height of the footer */ + background: #ffffff; +} + /*-- End Main Page Style -- */ -/* Share Styles */ -#userEmails { - float: left; - width: 50%; - padding: 5px; -} - -#userEmails textarea { - width: 100%; -} - -#currentUsers { - float: left; - width: 40%; - height: 400px; - padding: 5px; - padding-left: 15px; - margin-left: 15px; - border-left: 1px dotted gray; -} - -#currentUsers table { - width: 100%; -} - -#invitation { - border: 1px dotted gray; -} - -span.errorMsg{ +span.errorMsg { color: red; } diff --git a/wise-webapp/src/main/webapp/jsp/footer.jsp b/wise-webapp/src/main/webapp/jsp/footer.jsp index 9d583a02..e61cfb0e 100644 --- a/wise-webapp/src/main/webapp/jsp/footer.jsp +++ b/wise-webapp/src/main/webapp/jsp/footer.jsp @@ -1,7 +1,7 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -