Преглед на файлове

Update style for the register page.
Finished details for all "other pages" regarding style.

Lee Morgan преди 5 години
родител
ревизия
7ff2c3e4aa
променени са 6 файла, в които са добавени 229 реда и са изтрити 395 реда
  1. 0 5
      app.js
  2. 1 1
      views/otherPages/landing.ejs
  3. 2 2
      views/otherPages/login.ejs
  4. 8 8
      views/otherPages/register.ejs
  5. 218 168
      views/otherPages/style.css
  6. 0 211
      views/otherPages/style2.css

+ 0 - 5
app.js

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

+ 1 - 1
views/otherPages/landing.ejs

@@ -4,7 +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/style2.css">
+        <link rel="stylesheet" href="/otherPages/style.css">
         <link href="https://fonts.googleapis.com/css?family=Saira&display=swap" rel="stylesheet">
     </head>
     <body>

+ 2 - 2
views/otherPages/login.ejs

@@ -4,7 +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/style2.css">
+        <link rel="stylesheet" href="/otherPages/style.css">
         <link href="https://fonts.googleapis.com/css?family=Saira&display=swap" rel="stylesheet">
     </head>
     <body id="login" class="main-background">
@@ -28,7 +28,7 @@
                 <input type="password" name="password" required>
             </label>
     
-            <input id="signIn" type="submit" value="Sign In">
+            <input id="signIn" class="submitButton" type="submit" value="Sign In">
             
             <a href="/reset/email">Forgot your password?</a>
 

+ 8 - 8
views/otherPages/register.ejs

@@ -4,10 +4,10 @@
         <meta charset="UTF-8">
         <title>The Subline</title>
         <link rel="icon" type="img/png" href="/shared/images/logo.png">
-        <link rel="stylesheet" href="/otherPages/bundle.css">
+        <link rel="stylesheet" href="/otherPages/style.css">
         <link href="https://fonts.googleapis.com/css?family=Saira&display=swap" rel="stylesheet">
     </head>
-    <body id="register">
+    <body id="register" class="main-background">
         <div class="header">
             <a class="headerStart" href="/" >
                 <img src="/shared/images/logo.png" alt="Subline">
@@ -40,19 +40,19 @@
                 <input type="checkbox" name="agree" required>
 
                 <p>I agree to the 
-                    <a class="link" href="/privacy">Privacy Policy</a> and the 
-                    <a class="link" href="/terms">Terms and Conditions</a>
+                    <a href="/privacy">Privacy Policy</a> and the 
+                    <a href="/terms">Terms and Conditions</a>
                 </p>
             </label>
 
             <h2 class="customText">SIGN UP WITH:</h2>
 
             <button id="squareButton" class="button" formaction="/squarelogin">
-                <svg aria-hidden="true" viewBox="0 0 44 44" width="44" height="44">
+                <svg aria-hidden="true" viewBox="0 0 44 44" width="30" height="30">
                     <path fill="currentColor" d="M36.65 0H7.354A7.354 7.354 0 0 0 0 7.354V36.65a7.354 7.354 0 0 0 7.354 7.354H36.65a7.353 7.353 0 0 0 7.354-7.354V7.354A7.352 7.352 0 0 0 36.65 0zm-.646 33.685a2.32 2.32 0 0 1-2.32 2.32H10.325a2.32 2.32 0 0 1-2.321-2.32v-23.36a2.32 2.32 0 0 1 2.321-2.321h23.359a2.32 2.32 0 0 1 2.32 2.321v23.36z"></path>
                     <path fill="currentColor" d="M17.333 28.003c-.736 0-1.332-.6-1.332-1.339V17.34c0-.739.596-1.339 1.332-1.339h9.338c.738 0 1.332.6 1.332 1.339v9.324c0 .739-.594 1.339-1.332 1.339h-9.338z"></path>
                 </svg>
-                <svg aria-hidden="true" viewBox="0 0 66 22" width="105" height="35">
+                <svg aria-hidden="true" viewBox="0 0 66 22" width="75" height="25">
                     <path d="M11.2 10c-.7-.2-1.3-.4-1.8-.6C8.4 9 8 8.4 8 7.6c0-1.5 1.5-2.2 3-2.2 1.4 0 2.6.6 3.5 1.6l.1.1 1.2-.9-.1-.1c-1.1-1.4-2.7-2.2-4.6-2.2-1.2 0-2.4.3-3.2.9-1 .8-1.5 1.7-1.5 2.9 0 2.7 2.6 3.4 4.6 3.9 2.1.6 3.4 1 3.4 2.6s-1.3 2.6-3.2 2.6c-1 0-2.8-.3-3.9-2l-.1-.1-1.2.9v.1c1.1 1.6 2.9 2.5 5.1 2.5 2.9 0 4.9-1.6 4.9-4.1 0-2.8-2.7-3.5-4.8-4.1z" fill="currentColor"></path>
                     <path d="M25.5 9.5V8h1.4v14h-1.4v-5.5c-.8 1.1-2 1.7-3.4 1.7-2.7 0-4.5-2.1-4.5-5.2s1.9-5.2 4.5-5.2c1.4-.1 2.6.6 3.4 1.7zM19.1 13c0 2.9 1.6 3.9 3.2 3.9 2 0 3.3-1.5 3.3-3.9s-1.3-3.9-3.3-3.9c-2.4 0-3.2 2-3.2 3.9z" fill-rule="evenodd" clip-rule="evenodd" fill="currentColor"></path>
                     <path d="M36.2 8v5.5c0 1.9-1.3 3.3-3.2 3.3-1.5 0-2.3-.9-2.3-2.8V8h-1.4v6.4c0 2.4 1.3 3.8 3.5 3.8 1.4 0 2.5-.6 3.3-1.6V18h1.4V8h-1.3z" fill="currentColor"></path>
@@ -62,9 +62,9 @@
                 </svg>
             </button>
 
-            <button id="noneButton" class="button" formaction="/merchant/create/none">NO POS</button>
+            <button id="noneButton" class="submitButton" class="button" formaction="/merchant/create/none">NO POS</button>
 
-            <a class="link" href="/login">Already have an account? Please Sign In</a>
+            <a href="/login">Already have an account? Please Sign In</a>
         </form>
 
         <% include ../shared/footer %>

+ 218 - 168
views/otherPages/style.css

@@ -1,237 +1,287 @@
-*{margin:0;padding:0}
+*{margin:0;padding:0;font-family:'Saira',sans-serif;}
 
-form{
+html, body{
+    width: 100vw;
+    max-width: 100%;
+}
+
+.header{
     display: flex;
-    flex-direction: column;
-    justify-content: center;
-    border: 1px solid black;
-    padding: 25px;
-    background: rgb(240, 252, 255);
-    font-size: 16px;
-    margin-top: 40px;
-    width: 550px;
-    justify-content: space-evenly;
-    height: auto;
+    justify-content: space-between;
+    width: 100%;
+    background: rgb(0, 27, 45);
+    height: 75px;
+    padding: 0 25px;
+    box-sizing: border-box;
 }
 
-    input[type=text], input[type=password], input[type=email], select {
-        width: 100%;
-        padding: 12px 20px;
-        margin: 8px 0;
-        display: inline-block;
-        border: 1px solid #ccc;
-        border-radius: 4px;
-        box-sizing: border-box;
-        font-size: 16px;
-    }
-    
-    input[type=submit] {
-        width: 100%;
-        background-color:rgb(255, 99, 107);
-        color: white;
-        padding: 14px 20px;
-        margin: 8px 0;
-        border: none;
-        border-radius: 4px;
-        cursor: pointer;
-        font-size: 22px;
+    .headerStart{
+        display: flex;
+        align-items: center;
+        text-decoration: none;
     }
 
-    input[type=submit]:hover {
-        background: rgb(243, 77, 86);
+        .headerLogo{
+            color: white;
+            font-size: 25px;
+            margin-left: 10px;
+        }
+
+        .headerStart img{
+            max-height: 90%;
+        }
+
+    .headerEnd{
+        display: flex;
+        align-items: center;
+        height: 100%;
         color: white;
     }
 
-    input[type=text]:focus, input[type=password]:focus {
-        border: 2px solid #555;
-        outline: none;
-    }
+        .link{
+            margin: 10px;
+            color: white;
+        }
 
-#logInButton, #joinButton{
-    color: white;
-}
+        .enterButton{
+            background: rgb(179, 191, 209);
+            border: none;
+            text-decoration: none;
+            padding: 10px 25px;
+            color: black;
+            cursor: pointer;
+            text-align: center;
+            font-size: 15px;
+            min-width: 100px;
+            margin: 5px;
+            max-height: 52px;
+        }
 
-#squareButton{
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border: 1px solid black;
-    background: white;
-    color: black;
-}
+            .enterButton:hover{
+                background: rgb(240, 252, 255);
+                color:black;
+            }
 
-    #squareButton:hover{
-        color: white;
-        background: black;
-    }
+            .enterButton:active{
+                background: rgb(0, 27, 45);
+            }
 
-/* Public Strand */
-#publicStrand{
+.main-background{
     display: flex;
-    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    background-image: url("/shared/images/backgroundImg01.jpg");
+    background-repeat: no-repeat;
+    background-size: cover;
+    height: 88vh;
+    width: 100%;
+    color: rgb(0, 27, 45);
 }
 
-    .main-background{
+    .logo-text{
         display: flex;
+        flex-direction: column;
         align-items: center;
-        justify-content: center;
-        background-image: url("/shared/images/backgroundImg01.jpg");
-        background-repeat: no-repeat;
-        background-size: cover;
-        height: 88vh;
-        width: 100%;
-        color: rgb(0, 27, 45);
+        max-width: 50vw;
     }
 
-        .public-buttons{
-            position: absolute;
-            right: 50px;
-            top: 80px;
+        .logo-text img{
+            max-height: 25vh;
+            margin-bottom: 35px;
         }
-            
-            .public-buttons *{
-                margin: 10px;
-            }
 
-        .logo-text{
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
-            align-items: center;
-            max-width: 50vw;
+        .logo-text p{
+            font-weight: bold;
+            font-size: 25px;
+            color: rgb(255, 99, 107);
             text-align: center;
         }
 
-            .logo-text img{
-                max-height: 25vh;
-                margin-bottom: 50px;
-            }
+.more-info{
+    width: 100%;
+    padding: 75px;
+    background:rgb(0, 27, 45);
+    color: white;
+    box-sizing: border-box;
+    text-align: justify;
+    font-size: 25px;
+}
 
-            .logo-text p{
-                font-weight: bold;
-                font-size: 25px;
-                color: rgb(255, 99, 107);
-            }
-    
-    .more-info{
-        background: rgb(0, 27, 45);
-        color: rgb(201, 201, 201);
+    .more-info > *{
+        margin: 15px;
+    }
+
+    .line-break{
+        width: 100%;
+        border: 1px solid rgb(255, 99, 107);
+        margin: 30px 0;
+    }
+
+    .more-info h1{
+        color: rgb(255, 99, 107);
         text-align: center;
-        padding: 75px;
-        border-top: 5px solid black;
+        font-size: 45px;
+        margin: 25px 0;
     }
 
-        .more-info h1{
-            color: rgb(255, 99, 107);
-            margin: 25px;
-            font-size: 45px;
+    ul > *{
+        margin: 15px 0;
+    }
+
+    ul span{
+        color: rgb(255, 99, 107);
+    }
+
+    li{
+        font-size: 20px;
+    }
+
+#login{
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+    height: 100vh;
+}
+
+    form{
+        display: flex;
+        flex-direction: column;
+        padding: 25px;
+        background: rgb(240, 252, 255);
+        border: 1px solid black;
+        min-width: 500px;
+    }
+
+        form > *{
+            margin: 5px;
         }
 
-        .more-info p{
-            font-size: 25px;
-            color: rgb(201, 201, 201);
-            text-align: justify;
-            padding: 10px;
+        form h1{
+            text-align: center;
         }
 
-        .more-info li{
-            font-size: 20px;
-            color: rgb(201, 201, 201);
-            text-align: justify;
-            padding: 10px;
+        label{
+            display: flex;
+            flex-direction: column;
         }
 
-        .more-info span{
-            font-weight: bold;
-            color: rgb(255, 99, 107);
+        .submitButton{
+            background: rgb(0, 27, 45);
+            border: none;
+            text-decoration: none;
+            padding: 10px 25px;
+            color: white;
+            cursor: pointer;
+            text-align: center;
+            font-size: 15px;
+            min-width: 100px;
+            margin: 5px;
+            max-height: 52px;
         }
+        
+            .submitButton:hover{
+                background: rgb(179, 191, 209);
+                color:black;
+            }
+        
+            .submitButton:active{
+                background: rgb(240, 252, 255);
+            }
 
-/*
-Login Page
-*/
-#login{
+        form a{
+            text-align: center;
+            color: gray;
+            margin: 5px;
+            font-size: 20px;
+        }
+
+.footer{
     display: flex;
     flex-direction: column;
     align-items: center;
-    background-image: url("/shared/images/backgroundImg01.jpg");
-    background-repeat: no-repeat;
-    background-size: cover;
-    height: 100vh;
+    padding: 10px;
+    background: rgb(240, 252, 255);
+    width: 100%;
+    box-sizing: border-box;
 }
 
-/*
-RegisterPage
-*/
+    .footer div > *{
+        margin: 0 10px;
+    }
+
 #register{
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
     align-items: center;
-    background-image: url("/shared/images/backgroundImg01.jpg");
-    background-repeat: no-repeat;
-    background-size: cover;
-    height: 91.5vh;
+    height: 100vh;
 }
 
     #agreement{
-        display: flex;
+        flex-direction: row;
     }
 
-        #agreement input{
-            margin-right: 15px;
-        }
+    #agreement p{
+        margin-left: 10px;
+    }
 
     .customText{
-        margin: 20px auto 0 auto;
+        text-align: center;
     }
 
-    #noneButton{
+    #squareButton{
         display: flex;
         align-items: center;
         justify-content: center;
-        font-size: 35px;
+        border: 1px solid black;
+        background: white;
+        color: black;
+        height: 44px;
+        cursor: pointer;
     }
+    
+        #squareButton:hover{
+            color: white;
+            background: black;
+        }
 
-/*
-Footer Partial
-*/
-.spacer{
-    flex: 1;
-}
-
-.footer{
+.banner{
     display: flex;
-    flex-direction: column;
-    align-items: center;
+    width: 75%;
+    height: 65px;
+    margin: 10px auto;
+    box-shadow: 0 0 10px black;
+    border: 2px solid black;
+    background: white;
     position: fixed;
-    bottom: 0;
-    padding: 10px;
-    background: rgb(240, 252, 255);
-    width: 100%;
-    box-sizing: border-box;
 }
 
-    .footer > *{
-        margin: 5px;
-    }
-
-    .footer div > *{
-        margin: 0 25px;
-    }
-
-@media screen and (max-width: 600px){
-    .logo-text img{
-        max-height: 20vh;
+    .banner > div{
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 25%;
+        color: white;
     }
 
-    .logo-text p{
+    .banner > p{
+        display: flex;
+        align-items: center;
         font-size: 20px;
+        font-weight: bold;
+        width: 75%;
+        padding-left: 10px;
     }
 
-    .more-info{
-        padding: 25px;
-    }
-
-    .public-buttons{
-        right: 25vw;
-    }
-}
+    .banner > button{
+        background: none;
+        border: none;
+        height: 20px;
+        position: relative;
+        top: -10px;
+        right: -10px;
+        cursor: pointer;
+        color: white;
+        pointer-events: all;
+    }

+ 0 - 211
views/otherPages/style2.css

@@ -1,211 +0,0 @@
-*{margin:0;padding:0;font-family:'Saira',sans-serif;}
-
-html, body{
-    width: 100vw;
-    max-width: 100%;
-}
-
-.header{
-    display: flex;
-    justify-content: space-between;
-    width: 100%;
-    background: rgb(0, 27, 45);
-    height: 75px;
-    padding: 0 25px;
-    box-sizing: border-box;
-}
-
-    .headerStart{
-        display: flex;
-        align-items: center;
-        text-decoration: none;
-    }
-
-        .headerLogo{
-            color: white;
-            font-size: 25px;
-            margin-left: 10px;
-        }
-
-        .headerStart img{
-            max-height: 90%;
-        }
-
-    .headerEnd{
-        display: flex;
-        align-items: center;
-        height: 100%;
-        color: white;
-    }
-
-        .link{
-            margin: 10px;
-            color: white;
-        }
-
-        .enterButton{
-            background: rgb(179, 191, 209);
-            border: none;
-            text-decoration: none;
-            padding: 10px 25px;
-            color: black;
-            cursor: pointer;
-            text-align: center;
-            font-size: 15px;
-            min-width: 100px;
-            margin: 5px;
-            max-height: 52px;
-        }
-
-            .enterButton:hover{
-                background: rgb(240, 252, 255);
-                color:black;
-            }
-
-            .enterButton:active{
-                background: rgb(0, 27, 45);
-            }
-
-.main-background{
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background-image: url("/shared/images/backgroundImg01.jpg");
-    background-repeat: no-repeat;
-    background-size: cover;
-    height: 88vh;
-    width: 100%;
-    color: rgb(0, 27, 45);
-}
-
-    .logo-text{
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        max-width: 50vw;
-    }
-
-        .logo-text img{
-            max-height: 25vh;
-            margin-bottom: 35px;
-        }
-
-        .logo-text p{
-            font-weight: bold;
-            font-size: 25px;
-            color: rgb(255, 99, 107);
-            text-align: center;
-        }
-
-.more-info{
-    width: 100%;
-    padding: 75px;
-    background:rgb(0, 27, 45);
-    color: white;
-    box-sizing: border-box;
-    text-align: justify;
-    font-size: 25px;
-}
-
-    .more-info > *{
-        margin: 15px;
-    }
-
-    .line-break{
-        width: 100%;
-        border: 1px solid rgb(255, 99, 107);
-        margin: 30px 0;
-    }
-
-    .more-info h1{
-        color: rgb(255, 99, 107);
-        text-align: center;
-        font-size: 45px;
-        margin: 25px 0;
-    }
-
-    ul > *{
-        margin: 15px 0;
-    }
-
-    ul span{
-        color: rgb(255, 99, 107);
-    }
-
-    li{
-        font-size: 20px;
-    }
-
-#login{
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    align-items: center;
-    height: 100vh;
-}
-
-    form{
-        display: flex;
-        flex-direction: column;
-        padding: 25px;
-        background: rgb(240, 252, 255);
-        border: 1px solid black;
-        min-width: 500px;
-    }
-
-        form > *{
-            margin: 15px;
-        }
-
-        form h1{
-            text-align: center;
-        }
-
-        label{
-            display: flex;
-            flex-direction: column;
-        }
-
-        input[type=submit]{
-            background: rgb(0, 27, 45);
-            border: none;
-            text-decoration: none;
-            padding: 10px 25px;
-            color: white;
-            cursor: pointer;
-            text-align: center;
-            font-size: 15px;
-            min-width: 100px;
-            margin: 5px;
-            max-height: 52px;
-        }
-        
-            input[type=submit]:hover{
-                background: rgb(179, 191, 209);
-                color:black;
-            }
-        
-            input[type=submit]:active{
-                background: rgb(240, 252, 255);
-            }
-
-        form a{
-            text-align: center;
-            color: gray;
-            margin: 5px;
-            font-size: 20px;
-        }
-
-.footer{
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 10px;
-    background: rgb(240, 252, 255);
-    width: 100%;
-    box-sizing: border-box;
-}
-
-    .footer div > *{
-        margin: 0 10px;
-    }