From 17baada7b1aeb3f6ead1a9ba65f49199601aadba Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Wed, 25 Aug 2021 14:05:36 +0200
Subject: [PATCH] =?UTF-8?q?Fertigstellen=20des=20Sidenav=20Men=C3=BCs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/Customers.master     |  6 +--
 Customers/Login_Edit_User.aspx | 71 ++++++++++++++++++++++++--------
 Customers/Welcome.aspx         | 75 +++++++++++++++++++---------------
 css/navbarsidebar 2.css        |  3 ++
 4 files changed, 103 insertions(+), 52 deletions(-)

diff --git a/Customers/Customers.master b/Customers/Customers.master
index e9b000d..b5dc788 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -237,6 +237,7 @@
         }    
         #ContentPlaceHolder1{
             align-self:center;
+            width:1700px;
         }
         #form1{
             align-content:center
@@ -490,8 +491,7 @@
                                                         </div>                 
                                                             </div>
                                             <div style="padding-right:240px;">
-                                          <ul class="nav nav-pills">
-  
+                                          <ul class="nav nav-pills">  
                                               <li class="nav-item dropdown">
     <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false"><asp:LoginName ID="LoginName1" runat="server" /></a>
     <ul class="dropdown-menu">
@@ -512,7 +512,7 @@
     <form id="form1" runat="server">
     <div>
         <asp:ContentPlaceHolder id="ContentPlaceHolder1" runat="server">
-            
+           
         </asp:ContentPlaceHolder>
         </div> 
     </form>   
diff --git a/Customers/Login_Edit_User.aspx b/Customers/Login_Edit_User.aspx
index ffc1b45..bfad987 100644
--- a/Customers/Login_Edit_User.aspx
+++ b/Customers/Login_Edit_User.aspx
@@ -11,24 +11,43 @@
    
     <!-- Bootstrap CSS -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
-    <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>           <!-- Bootstrap CSS -->    
+    <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
+           <!-- Bootstrap CSS -->
+    
      
      <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
-    
-    <%@ import Namespace="MySql.Data.MySqlClient" %>
-    
+    <link rel="shortcut icon" href="images/Icons/favicon/favicon.ico" />
     <style>
-       textcontent1{
-           font-size:/*18px*/0.7377049180327869vw;
-       }
-        @media (min-width: 575px) {
-            .modal-dialog modal-dialog-scrollable{
-                width:850px;
+         .btn btn-primary{
+               color: #043381;
+               background-color: #fff;
             }
-        }
-
-        @media (max-width: 575px) {
-              .modal-dialog modal-dialog-scrollable{
+         #tableSearch{
+              width:1500px;              
+         }
+         .align-self-xl-start{
+             width:100%;
+         }         
+         #normaltable{
+             width:1500px;
+         }
+        @media (max-width: 558.98px) {
+           #conovertab {
+                width: 350px;                
+                overflow-x: auto;
+            } 
+           h1{
+               font-size:12px;
+           }
+           #tableSearch{
+               max-width:350px;
+           }
+           #containerseiterand{
+               margin-left:5px;
+               margin-right:5px;
+               width:350px;
+           }
+             .modal-dialog modal-dialog-scrollable{
                 width:250px;
                 overflow-x:auto;
             }
@@ -42,9 +61,29 @@
            #butclose{
                transform:translateX(-50%);
            }  
-        }
+        }   
+         textcontent1{
+           font-size:/*18px*/0.7377049180327869vw;
+       }
+        @media (min-width: 575px) {
+            .modal-dialog modal-dialog-scrollable{
+                width:850px;
+            }
+        }  
     </style>
-    <link rel="stylesheet" href="../css/navbarsidebar2.css" type="text/css" />
+     <%@ import Namespace="MySql.Data.MySqlClient" %>
+     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" title="VERAG IndexCustomer"/>      
+   
+    <link rel="stylesheet" type="text/css" href="../css/main.css"/>
+    <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>        
+ 
+    <link rel="stylesheet" type="text/css" href="../stylesheets/style.css"/>
+    <link rel="stylesheet" type="text/css" href="../stylesheets/example.css"/>   
+     
+    <link rel="stylesheet" href="../css/navbarsidebar.css" type="text/css" />
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
     <div class="flex-fill">        
diff --git a/Customers/Welcome.aspx b/Customers/Welcome.aspx
index 571ecb2..f7b9180 100644
--- a/Customers/Welcome.aspx
+++ b/Customers/Welcome.aspx
@@ -1,7 +1,7 @@
 <%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Welcome.aspx.vb" Inherits="Customers_Default" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
-        <!-- Bootstrap -->
+    <!-- Bootstrap -->
     <html lang="en"></html>
     <!-- Required meta tags -->
     <meta charset="utf-8"/>
@@ -14,44 +14,53 @@
     
      
      <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
-    
-    <%@ import Namespace="MySql.Data.MySqlClient" %>
-   <style>
-      .container{
-        background-color:#fff;         
-        font-size: 1em;         
-      }
-       @media (max-width: 558.98px) {
-           
-
-           #imgcar {
-               width: 112px;
-               height: 70px;
+    <link rel="shortcut icon" href="images/Icons/favicon/favicon.ico" />
+    <style>
+         .btn btn-primary{
+               color: #043381;
+               background-color: #fff;
+            }
+         #tableSearch{
+              width:1500px;              
+         }
+         .align-self-xl-start{
+             width:100%;
+         }         
+         #normaltable{
+             width:1500px;
+         }
+        @media (max-width: 558.98px) {
+           #conovertab {
+                width: 350px;                
+                overflow-x: auto;
+            } 
+           h1{
+               font-size:12px;
            }
-
-           #imgcar {
-               width: 112px;
-               height: 70px;
+           #tableSearch{
+               max-width:350px;
            }
-           .align-self-xl-start{
-               width:600px;
+           #containerseiterand{
+               margin-left:5px;
+               margin-right:5px;
+               width:350px;
            }
-       }
-           @media (min-width: 558.98px) {
-              
-
-               #imgcar {
-                   width: 1296px;
-                   height: 813px;
-               }
-           }
-       </style>
+        }        
+    </style>    
+     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" title="VERAG IndexCustomer"/>      
+    <link rel="stylesheet" type="text/css" href="../css/navbarsidebar.css"/>   
+    <link rel="stylesheet" type="text/css" href="../css/main.css"/>
+    <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/Welcome.css"/>
-    <link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css" />
+    <!--    <link rel="stylesheet" type="text/css" href="css/edit_main.css"> -->
+    <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"/>   
+     
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
-    <div class="align-self-xl-start" style="/*margin-top:5px;*/margin-left:30px; margin-top:0.6510416666666667vw; margin-right:30px; place-content:center; width:1725px;">
+    <div class="align-self-xl-start" style="/*margin-top:5px;*/margin-left:30px; margin-top:0.6510416666666667vw; margin-right:30px; place-content:center; width:1700px;">
             <div id="containerseiterand" style="width:1625px"> 
        
         <div>
diff --git a/css/navbarsidebar 2.css b/css/navbarsidebar 2.css
index 72dceb6..893af60 100644
--- a/css/navbarsidebar 2.css	
+++ b/css/navbarsidebar 2.css	
@@ -207,6 +207,9 @@ a:focus {
                 padding: 1.25em;
                 min-height: 100vh;
                 transition: all 0.5s;
+                margin-left:auto;
+                margin-right:auto;
+                width:1700px;
                
             }
             #container-xxl {