From 50532d85f2623402ae9196484785ed2cc5f893ba Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 25 Oct 2021 15:01:44 +0200
Subject: [PATCH] vereinheitlichung schrift und fonts

---
 css/login/Changepw.css   |  8 +++----
 css/login/ForgotPW.css   | 11 +++++-----
 css/login/loginFLEX.css  | 14 ++++++------
 login/ForgotPW.aspx      | 45 ++++++++++++++++++---------------------
 login/login_TEST.aspx    | 46 ++++++++++++----------------------------
 login/login_TEST.aspx.vb |  5 -----
 6 files changed, 52 insertions(+), 77 deletions(-)

diff --git a/css/login/Changepw.css b/css/login/Changepw.css
index 13302b8..517a0d2 100644
--- a/css/login/Changepw.css
+++ b/css/login/Changepw.css
@@ -16,7 +16,7 @@
     color: red;
 }
 #txt_Pw_WH:valid {
-    background-color: lightgreen;
+    background-color: white;
     border-color: forestgreen;
     color: black;
 }
@@ -31,7 +31,7 @@
     color: red;
 }
 #txt_Pw:valid {
-    background-color: lightgreen;
+    background-color: white;
     border-color: forestgreen;
     color: black;
 }
@@ -47,7 +47,7 @@
 }
 
 #txt_Pw_WH_M:valid {
-    background-color: lightgreen;
+    background-color: white;
     border-color: forestgreen;
     color: black;
 }
@@ -64,7 +64,7 @@
 }
 
 #txt_Pw_M:valid {
-    background-color: lightgreen;
+    background-color: white;
     border-color: forestgreen;
     color: black;
 }
diff --git a/css/login/ForgotPW.css b/css/login/ForgotPW.css
index 94079bb..8b5a541 100644
--- a/css/login/ForgotPW.css
+++ b/css/login/ForgotPW.css
@@ -42,8 +42,9 @@
     font-size: 11px;
     border: 1px solid gray;
     width: 400px;
-    height: 270px;
-    margin-block: auto auto;
+    height: 260px;
+    margin-block: auto inherit;
+    margin-top:40px;
 }
 
 #lbl_Ueberschrift {
@@ -138,7 +139,7 @@
         color: red;
 }
 #CustomerID:valid {
-    background-color: lightgreen;
+    background-color: white;
     border-color: forestgreen;
     color: black;
 }
@@ -153,7 +154,7 @@
 }
 
 #txt_Username:valid {
-    background-color: lightgreen;
+    background-color: white;
     border-color: forestgreen;
     color: black;
 }
@@ -168,7 +169,7 @@
 }
 
 #txtEmail:valid {
-    background-color: lightgreen;
+    background-color: white;
     border-color: forestgreen;
     color: black;
 }
diff --git a/css/login/loginFLEX.css b/css/login/loginFLEX.css
index 26bcecc..7d9bcd1 100644
--- a/css/login/loginFLEX.css
+++ b/css/login/loginFLEX.css
@@ -87,11 +87,11 @@
         border-color: red;
         color: red;
     }
-    #CustomerID:valid {
-        background-color: lightgreen;
-        border-color: forestgreen;
-       color: black;
-    }
+        #CustomerID:valid {
+            background-color: white;
+            border-color: forestgreen;
+            color: black;
+        }
     #CustomerID:invalid + span::before {
         content: '✖';
         color: red;
@@ -102,7 +102,7 @@
         color: red;
     }
     #Password:valid {
-        background-color: lightgreen;
+        background-color: white;
         border-color: forestgreen;
         color: black;
     }
@@ -116,7 +116,7 @@
         color: red;
     }
     #UserName:valid {
-        background-color: lightgreen;
+        background-color: white;
         border-color: forestgreen;
         color: black;
     }
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 8c2d407..81f7763 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -202,7 +202,7 @@
         color: red;
 }
 #CustomerID_M:valid {
-    background-color: lightgreen;
+    background-color: white;
     border-color: forestgreen;
     color: black;
 }
@@ -217,7 +217,7 @@
 }
 
 #UserName_M:valid {
-    background-color: lightgreen;
+    background-color: white;
     border-color: forestgreen;
     color: black;
 }
@@ -232,7 +232,7 @@
 }
 
 #txtEmail_M:valid {
-    background-color: lightgreen;
+    background-color: white;
     border-color: forestgreen;
     color: black;
 }
@@ -280,52 +280,49 @@
             <center>
                    <!-- Große Bildschirme-->   
             <div class="d-none d-md-block">
-            <table id="tbl_main" cellpadding="0" style="margin: 15% 2px 2px 2px; border:none;">
-                <tr style="color:#003680;height:45px;">
+            <table id="tbl_main" cellpadding="0" style="margin: 15px auto auto auto; border:none;">
+                <tr style="color:#003680;height:48px;">
                                    <td>
-                                       <asp:Button ID="btn_Back" runat="server" Width="265" CausesValidation="false" Text="Back"  OnClientClick="JavaScript:window.history.back(1);return false;" style="margin-left:49px;height:31px;font-weight:300"/>
+                                       <asp:Button ID="btn_Back" runat="server" Width="265" CausesValidation="false" Text="Back"  OnClientClick="JavaScript:window.history.back(1);return false;" style="margin-left:49px;height:31px;font-weight:300;font-size:20px"/>
                                    </td>
                                </tr>
                  <tr style="color:#003680; height:32px;font-size:14px">
                    <td align="center" colspan="2" style="color:#fff;font-kerning:auto;font-weight:700;">                                     
-            <asp:Label ID="lbl_PWvergessen" Text="Forgot your password?" runat="server" style="color:#003680; margin-left:82px;font-size:17px;"></asp:Label>
+            <asp:Label ID="lbl_PWvergessen" Text="Forgot your password?" runat="server" style="color:#003680; margin-left:72px;font-size:20px;font-weight:300"></asp:Label>
                    </td></tr>  
                <!-- <tr style=" background-color:#fff; color:#003680; height:30px;font-size:12px">
                    <td align="center" colspan="2" style="color:#fff;font-kerning:auto;font-weight:700;">                                     
             <asp:Label ID="Label1" Text="Geben Sie Ihre hinterlegte E-Mail-Adresse ein, um einen Link zum Rücksetzen des Passwortes zu erhalten." runat="server" style=" background-color:#fff; color:#003680; font-size:12px"></asp:Label>
                    </td></tr> -->
-                 <tr style="color:#003680; height:30px;">
-                       <td align="right" colspan="2">  
-            <h2 style="margin-left:94px; margin-top:-4px">Fill in your data here:</h2>
-                                             </td></tr>
-               <tr style="color:#003680; height:30px;"><td colspan="2">
+                 <tr style="color:#003680; height:38px;">
+                       <td align="right" colspan="2"> 
+                           <asp:label ID="lbl_filldatahere" runat="server" Text="Fill in your data here:" Font-Size="20px" style="margin-left:94px; margin-top:-4px;color:#003680;font-weight:300"></asp:label>           
+               </td></tr>
+               <tr style="color:#003680; height:38px;"><td colspan="2">
                        <asp:TextBox ID="txt_CustomerID" CssClass="bg-UID-icon" runat="server" ValidationGroup="val-desk" SetFocusOnError="true" Width="265" Placeholder="Customer-ID" style="margin-left:45px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" Font-Size="1.125em"></asp:TextBox>                                             
                        <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="txt_CustomerID" SetFocusOnError="true" ForeColor="Red" Text="" ValidationGroup="val-desk"></asp:RequiredFieldValidator>
                     </td></tr>
-                <tr style="color:#003680; height:30px;">                                 
+                <tr style="color:#003680; height:38px;">                                 
                     <td align="left" colspan="2">  
                         <asp:TextBox ID="txtEmail" runat="server" Width="265" ValidationGroup="val-desk" ForeColor="Red" Font-Size="1.125em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-left:45px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"/>                    
                         <asp:RequiredFieldValidator ID="valreqtxtEmail" ControlToValidate="txtEmail" SetFocusOnError="true" ValidationGroup="val-desk" runat="server" Text="" ForeColor="Red"></asp:RequiredFieldValidator>                                                  
                     </td></tr>
-                <tr style="color:#003680; height:20px;">                                
+                <tr style="color:#003680; height:38px;">                                
                      <td align="left" colspan="2"> 
                     <asp:TextBox ID="txt_Username" runat="server" CssClass="bg-user-icon" ValidationGroup="val-desk" Placeholder="Username" Font-Size="1.125em" Width="265" style="margin-left:45px;color:#003680;margin-bottom:-6px;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" />
-                        <asp:RequiredFieldValidator ID="valreqtxtusername" SetFocusOnError="true" ControlToValidate="txt_Username" ValidationGroup="val-desk" runat="server" ForeColor="Red" Text="" ErrorMessage=""></asp:RequiredFieldValidator>           
-                
-                     </td></tr>
-                <tr style="color:#003680; height:30px;">
+                    <asp:RequiredFieldValidator ID="valreqtxtusername" SetFocusOnError="true" ControlToValidate="txt_Username" ValidationGroup="val-desk" runat="server" ForeColor="Red" Text="" ErrorMessage=""></asp:RequiredFieldValidator>                           
+                     </td></tr>                              
+                <tr style="color:#003680; height:49px;"><td>    
+                     <asp:LinkButton ID="btn_Send" runat="server" CssClass="btn btn-primary" Width="265px" Enabled="true" AutoPostBack="True" Font-Size="22px" style="margin-left:49px;border:none" OnClick="btn_Send_Click" Height="40px"><center><label for="btn_Send" style="color:#fff;margin:0 2px 2px auto;font-size:21px"><center>Send</center></label></center></asp:LinkButton> 
+                                    </td></tr> 
+                <tr style="color:#003680; height:38px;">
                 <td align="right" colspan="2">                    
                 <asp:Label ID="lblMessage" runat="server" />
                     <asp:RegularExpressionValidator ID="valid_getNumberInput" ControlToValidate="txt_CustomerID" style="font-size:17px" ForeColor="Red" ValidationGroup="val-desk" runat="server" Display="Dynamic" SetFocusOnError="false" ErrorMessage="The Customer-ID is not valid." ValidationExpression="[0-9]{4,10}"></asp:RegularExpressionValidator>
                     <asp:RegularExpressionValidator ID="check_UserName_regex" ErrorMessage="The Username don't meet the requirements. Try again." ControlToValidate="txt_Username" ValidationGroup="val-desk" runat="server" Display="Dynamic" SetFocusOnError="false" ForeColor="Red" ValidationExpression="([a-zA-Z1-9]{4,30})"></asp:RegularExpressionValidator>
                     <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email_2" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ForeColor="Red" SetFocusOnError="true"></asp:RegularExpressionValidator>    
                     <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@(\bverag.ag\b)" Display="Dynamic" SetFocusOnError="true" style="font-size:1em" ForeColor="Red"></asp:RegularExpressionValidator>
-                </td></tr>                
-                <tr style="color:#003680; height:32px;"><td>    
-                     <asp:LinkButton ID="btn_Send" runat="server" CssClass="btn btn-primary" Width="265px" Enabled="true" AutoPostBack="True" Font-Size="22px" style="margin-left:49px;border:none" OnClick="btn_Send_Click" Height="40px"><center><label for="btn_Send" style="color:#fff;margin:0 2px 2px auto;font-size:21px"><center>Send</center></label></center></asp:LinkButton> 
-                                    </td></tr> 
-                <tr><td>                     
-                    </td></tr>
+                </td></tr>  
                                 </table>
                 </div>
                  <!--Smartphone-Bildschirme-->   
diff --git a/login/login_TEST.aspx b/login/login_TEST.aspx
index eb1bfec..af5c4aa 100644
--- a/login/login_TEST.aspx
+++ b/login/login_TEST.aspx
@@ -4,8 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-       <%@ import Namespace="MySql.Data.MySqlClient" %>
- 
+       <%@ import Namespace="MySql.Data.MySqlClient" %> 
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <title>VERAG Spedition AG Login</title>
@@ -13,8 +12,7 @@
         <link rel="stylesheet" type="text/css" href="../css/style.css"/>
         <LINK REL="SHORTCUT ICON" HREF="../images/Icons/favicon/favicon.ico" />
     <!--    <link rel="stylesheet" type="text/css" href="css/edit_main.css"> -->
-        <script src="js/netzwerk.js" type="text/javascript"></script>
-        
+        <script src="js/netzwerk.js" type="text/javascript"></script>        
  
     <link rel="stylesheet" type="text/css" href="../../stylesheets/style.css"/>
     <link rel="stylesheet" type="text/css" href="../../stylesheets/example.css"/>
@@ -71,15 +69,8 @@
     </script>
               </head>
  
- <body onload="FocusOnInput()">      
-       
-     
-          
-         <!-- #include file="../navigation.aspx" -->    
-       
-        
-          
-               
+ <body onload="FocusOnInput()">         
+         <!-- #include file="../navigation.aspx" -->        
         <form id="form1" runat="server">
         <asp:Login ID = "Login1" runat = "server" OnAuthenticate= "ValidateUser">
             <LayoutTemplate>        
@@ -88,14 +79,12 @@
                                         <td align="center" colspan="2" style="color:#fff;">Bitte melden Sie sich an:</td>
                                     </tr>
                                     <tr>
-                                         <td align="right">
-                              
-                                          <asp:Label ID="UserNameLabel" runat="server" AssociatedControlID="UserName" required>Benutzername:</asp:Label>
+                                         <td align="right">                              
+                                          <asp:Label ID="UserNameLabel" runat="server" AssociatedControlID="UserName">Benutzername:</asp:Label>
                                         </td> 
-                                        <td>
-                                
+                                        <td>                                
                                            <asp:TextBox ID="UserName" runat="server"></asp:TextBox>
-                                            <asp:RequiredFieldValidator ID="UserNameRequired" runat="server" ControlToValidate="UserName" ErrorMessage="Der Benutzername ist erforderlich." ToolTip="Der Benutzername ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator> 
+                                           <asp:RequiredFieldValidator ID="UserNameRequired" runat="server" ControlToValidate="UserName" ErrorMessage="Der Benutzername ist erforderlich." ToolTip="Der Benutzername ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator> 
                                         </td>
                                     </tr>
                                     <tr>
@@ -104,13 +93,12 @@
                                         </td> 
                                         <td>
                                             <asp:TextBox ID="Password" runat="server" TextMode="Password"></asp:TextBox>
-                                            <asp:RequiredFieldValidator ID="PasswordRequired" runat="server" ControlToValidate="Password" ErrorMessage="Das Kennwort ist erforderlich." ToolTip="Das Kennwort ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator> 
-                                                                                        
+                                            <asp:RequiredFieldValidator ID="PasswordRequired" runat="server" ControlToValidate="Password" ErrorMessage="Das Kennwort ist erforderlich." ToolTip="Das Kennwort ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator>                                                                                         
                                         </td>
                                     </tr>
                                     <tr>
                                         <td></td>
-                                        <td   >
+                                        <td>
                                             <asp:CheckBox ID="RememberMe" runat="server" Text="Anmeldedaten speichern." />
                                         </td>
                                     </tr>
@@ -124,15 +112,9 @@
                                            <br/> <asp:Button ID="LoginButton" runat="server" CommandName="Login" Text="Anmelden" ValidationGroup="Login1"/>
                                         </td>
                                     </tr>
-                                </table>
-            
+                                </table>            
                      </LayoutTemplate>
                 </asp:Login>
-            </form>
-      
-        
-    
-    </body>
-    
-</html>
-
+            </form>  
+    </body>    
+</html>
\ No newline at end of file
diff --git a/login/login_TEST.aspx.vb b/login/login_TEST.aspx.vb
index 027bc02..728c606 100644
--- a/login/login_TEST.aspx.vb
+++ b/login/login_TEST.aspx.vb
@@ -16,7 +16,6 @@ Partial Class login_TEST
             'ConnectionString = "Server=db593295684.db.1and1.com;Database=db593295684;Uid=dbo593295684;Pwd=atilla#2;"
         End If
 
-
         ' Dim constr As String = ConfigurationManager.ConnectionStrings("constr").ConnectionString
         Using con As New SqlConnection(ConnectionString)
             ' Using cmd As New SqlCommand("Validate_User")
@@ -48,13 +47,9 @@ Partial Class login_TEST
                 dr.Close()
                 con.Close()
             End Using
-
-
         End Using
     End Sub
 
-
-
     Protected Sub LoginButton_Click(sender As Object, e As EventArgs)
 
     End Sub