Cleanup, remove inline style

ipb-halle · Oct 29, 2024 · ec1dfb3 · ec1dfb3
1 parent 291179d
commit ec1dfb3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ LocalDatabasesFolderForWeb = /vol/file_databases' > /MetFragRelaunched/MetFragWe
 
 RUN mvn -Dhttps.protocols=TLSv1.2 -f MetFragRelaunched clean package -pl MetFragLib -pl MetFragWeb -am -DskipTests
 
-FROM alpine:latest as downloader
+FROM alpine:latest AS downloader
 
 RUN mkdir -p /vol/file_databases; cd /vol/file_databases && \
 	wget -q https://zenodo.org/records/3548461/files/NORMANSusDat_20Nov2019.csv && \

diff --git a/MetFragWeb/src/main/webapp/landing.xhtml b/MetFragWeb/src/main/webapp/landing.xhtml
@@ -1,31 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html">
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns:ui="jakarta.faces.facelets"
+      xmlns:h="jakarta.faces.html">
+
 <h:head>
-	<title><ui:insert name="title">MetFrag</ui:insert></title>
-	<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Lato:wght@300;400&amp;display=swap" />
-	<h:outputStylesheet name='css/style.css'  rel='stylesheet' type='text/css'/>
+    <title><ui:insert name="title">MetFrag</ui:insert></title>
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Lato:wght@300;400&amp;display=swap"/>
+    <h:outputStylesheet name="css/style.css" rel="stylesheet" type="text/css"/>
 </h:head>
 
-<h:body	style="min-height: 100%; height:100%; margin-right: 0; margin-left: 0; margin-bottom:0; padding:0; font-size: 95%;
-	background: #E2E2E2 url('resources/images/body-bg.png') repeat-x scroll 0 0;">
-	<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" />
-			</ui:insert>
-		</div>
-
-		<div id="landingPage" style="width: 90%; margin-left: auto; margin-right: auto;">
-			<ui:insert name="content" >
-				<ui:include src="includes/landingPage.xhtml" />
+<h:body class="body-style">
+    <h:panelGroup layout="block" id="container">
+        <div id="header">
+            <ui:insert name="header">
+                <ui:include src="includes/header.xhtml"/>
+            </ui:insert>
+        </div>
+
+		<div id="landingPage" class="landing-page-style">
+			<ui:insert name="content">
+				<ui:include src="includes/landingPage.xhtml"/>
 			</ui:insert>
 		</div>
-
-	</h:panelGroup>
+    </h:panelGroup>
 </h:body>
 
 </html>
diff --git a/MetFragWeb/src/main/webapp/resources/css/style.css b/MetFragWeb/src/main/webapp/resources/css/style.css
@@ -634,4 +634,9 @@ html,body {
 
  .footer-title {
 	 font-weight: bold;
+ }
+
+ .landing-page-style {
+	 width: 90%;
+	 margin: 0 auto;
  }