Revert some changes back, because footer was not working correct.

ipb-halle · Oct 30, 2024 · cac6bfb · cac6bfb
1 parent 6e0ab1f
commit cac6bfb
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 9 deletions.
diff --git a/MetFragWeb/src/main/webapp/comparespectrad3js.xhtml b/MetFragWeb/src/main/webapp/comparespectrad3js.xhtml
@@ -15,7 +15,7 @@
 
 <h:body	style="min-height: 100%; height:100%; margin-right: 0; margin-left: 0; margin-bottom:0; padding:0; font-size: 0.8em;
 	background: #E2E2E2;">
-	<h:panelGroup layout="block">
+	<h:panelGroup layout="block" id="container">
 		<div id="header" style="margin-left: auto; margin-right: auto; padding-top: 25px">
 			<ui:insert name="header" >
 				<ui:include src="includes/header.xhtml" />

diff --git a/MetFragWeb/src/main/webapp/index.xhtml b/MetFragWeb/src/main/webapp/index.xhtml
@@ -11,7 +11,7 @@
 </h:head>
 
 <h:body class="body-style">
-    <h:panelGroup layout="block">
+    <h:panelGroup layout="block" id="container">
         <div id="header">
             <ui:insert name="header">
                 <ui:include src="includes/header.xhtml"/>

diff --git a/MetFragWeb/src/main/webapp/landing.xhtml b/MetFragWeb/src/main/webapp/landing.xhtml
@@ -11,7 +11,7 @@
 </h:head>
 
 <h:body class="body-style">
-    <h:panelGroup layout="block">
+    <h:panelGroup layout="block" id="container">
         <div id="header">
             <ui:insert name="header">
                 <ui:include src="includes/header.xhtml"/>

diff --git a/MetFragWeb/src/main/webapp/resources/css/style.css b/MetFragWeb/src/main/webapp/resources/css/style.css
@@ -162,6 +162,29 @@
 	border-radius: 4px;
 }
 
+html,body {
+	margin: 0;
+	padding: 0;
+	height: 100%;
+}
+
+#container {
+	min-height: 100%;
+	position: relative;
+	height: auto !important;
+}
+
+#header {
+	width: 90%;
+}
+
+#content {
+	width: 90%;
+	padding-bottom: 370px;
+	height: auto;
+	position: relative;
+}
+
 @media all and (max-device-width: 600px) {
 	#content {
 		width: 100%;
@@ -504,11 +527,15 @@
 	z-index: 0 !important;
 }
 
- .body-style {
-	 margin: 0;
-	 font-size: 0.8em;
-	 background: #E2E2E2;
- }
+.body-style {
+	min-height: 100%;
+	height: 100%;
+	margin: 0;
+	padding: 0;
+	font-size: 0.8em;
+	background: #E2E2E2;
+	overflow-x: hidden;
+}
 
  #header, #content {
 	 margin-left: auto;

diff --git a/MetFragWeb/src/main/webapp/upload.xhtml b/MetFragWeb/src/main/webapp/upload.xhtml
@@ -12,7 +12,7 @@
 
 <h:body	style="min-height: 100%; height:100%; margin-right: 0; margin-left: 0; margin-bottom:0; padding:0; font-size: 95%;
 	background: #E2E2E2;">
-	<h:panelGroup layout="block">
+	<h:panelGroup layout="block" id="container">
 		<div id="header" style="width: 90%; margin-left: auto; margin-right: auto; padding-top: 25px">
 			<ui:insert name="header" >
 				<ui:include src="includes/header.xhtml" />