Quellcode durchsuchen

Fixx css on other pages.

Lee Morgan vor 5 Jahren
Ursprung
Commit
a0e8b988ed

+ 5 - 0
app.js

@@ -56,6 +56,11 @@ cssmerger([
     "./views/dashboardPage/css"
 ], "./views/dashboardPage/bundle.css");
 
+cssmerger([
+    "./views/shared/css/",
+    "./views/otherPages/style.css"
+], "./views/otherPages/bundle.css");
+
 if(process.env.NODE_ENV === "production"){
     httpsServer.listen(process.env.HTTPS_PORT, ()=>{});
 }

+ 0 - 1
views/informationPages/help.ejs

@@ -5,7 +5,6 @@
         <meta content="width=device-width, initial-scale=1" name="viewport"/>
         <title>The Subline</title>
         <link rel="icon" type="img/png" href="/shared/images/logo.png">
-        <link rel="stylesheet" href="/shared/css/header.css">
         <link rel="stylesheet" href="/informationPages/information.css">
         <link href="https://fonts.googleapis.com/css?family=Saira&display=swap" rel="stylesheet">
     </head>

+ 0 - 1
views/informationPages/privacyPolicy.ejs

@@ -5,7 +5,6 @@
         <meta content="width=device-width, initial-scale=1" name="viewport"/>
         <title>The Subline</title>
         <link rel="icon" type="img/png" href="/shared/images/logo.png">
-        <link rel="stylesheet" href="/shared/shared.css">
         <link rel="stylesheet" href="/informationPages/information.css">
         <link href="https://fonts.googleapis.com/css?family=Saira&display=swap" rel="stylesheet">
     </head>

+ 0 - 1
views/informationPages/terms.ejs

@@ -5,7 +5,6 @@
         <meta content="width=device-width, initial-scale=1" name="viewport"/>
         <title>The Subline</title>
         <link rel="icon" type="img/png" href="/shared/images/logo.png">
-        <link rel="stylesheet" href="/shared/shared.css">
         <link rel="stylesheet" href="/informationPages/information.css">
         <link href="https://fonts.googleapis.com/css?family=Saira&display=swap" rel="stylesheet">
     </head>

+ 1 - 2
views/otherPages/landing.ejs

@@ -4,8 +4,7 @@
         <meta charset="utf-8">
         <title>The Subline</title>
         <link rel="icon" type="img/png" href="/shared/images/logo.png">
-        <link rel="stylesheet" href="/otherPages/style.css">
-        <link rel="stylesheet" href="/shared/shared.css">
+        <link rel="stylesheet" href="/otherPages/bundle.css">
         <link href="https://fonts.googleapis.com/css?family=Saira&display=swap" rel="stylesheet">
     </head>
     <body>

+ 1 - 2
views/otherPages/login.ejs

@@ -4,8 +4,7 @@
         <meta charset="utf-8">
         <title>The Subline</title>
         <link rel="icon" type="img/png" href="/shared/images/logo.png">
-        <link rel="stylesheet" href="/otherPages/style.css">
-        <link rel="stylesheet" href="/shared/shared.css">
+        <link rel="stylesheet" href="/otherPages/bundle.css">
         <link href="https://fonts.googleapis.com/css?family=Saira&display=swap" rel="stylesheet">
     </head>
     <body id="login">

+ 1 - 2
views/otherPages/register.ejs

@@ -4,8 +4,7 @@
         <meta charset="UTF-8">
         <title>The Subline</title>
         <link rel="icon" type="img/png" href="/shared/images/logo.png">
-        <link rel="stylesheet" href="/otherPages/style.css">
-        <link rel="stylesheet" href="/shared/shared.css">
+        <link rel="stylesheet" href="/otherPages/bundle.css">
         <link href="https://fonts.googleapis.com/css?family=Saira&display=swap" rel="stylesheet">
     </head>
     <body id="register">

+ 5 - 1
views/otherPages/style.css

@@ -1,3 +1,5 @@
+*{margin:0;padding:0}
+
 form{
     display: flex;
     flex-direction: column;
@@ -155,7 +157,7 @@ Login Page
     background-image: url("/shared/images/backgroundImg01.jpg");
     background-repeat: no-repeat;
     background-size: cover;
-    height: 91.5vh;
+    height: 100vh;
 }
 
 /*
@@ -201,6 +203,8 @@ Footer Partial
     display: flex;
     flex-direction: column;
     align-items: center;
+    position: fixed;
+    bottom: 0;
     padding: 10px;
     background: rgb(240, 252, 255);
     width: 100%;