From ece34a38666be861989576e42ab9a0fdb0569f06 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Thu, 2 Sep 2021 11:44:18 +0200
Subject: [PATCH] Ausgleichen von Umbenennen derSeite und Synchronisation mit
 Titel sowie Button-Layout Anordnung

---
 Customers/Customers.master            | 24 +++++++-------
 css/Customers/MasterpageCustomers.css | 47 ++++++++++++++++++++++++++-
 2 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/Customers/Customers.master b/Customers/Customers.master
index f62cd0d..f89fb19 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -264,13 +264,13 @@
                                                              <!--  </ul>-->
                        </li>
                 
-                       <a class="btn btn-primary" data-bs-toggle="collapse" href="#collapseExample2" role="button" aria-expanded="false" aria-controls="collapseExample">
+   <a class="btn btn-primary" data-bs-toggle="collapse" href="#collapseExample2" role="button" aria-expanded="false" aria-controls="collapseExample">
    <img src="../images/samples/default-avatar.jpg"; width="20"; /><asp:LoginName ID="LoginName4" runat="server" style="margin-left:6px"/></a>
  
 <div class="collapse" id="collapseExample2">  
       <ul style="list-style:unset">
-          <li> <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381"><img src="../images/samples/default-avatar.jpg"; width="20"; /></button> Profil bearbeiten </li>
-          <li> <button type="button" onclick="LogoutButton_Click" style="text-decoration: none;background-color:#fff;color:#043381"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff;"/>Logout</button></li>
+          <li> <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381"><img src="../images/Icons/main/gear_blue.png"; style="width:15px; height:15px;color:#043381;background-color:#fff;margin-right:6px;" />Profil bearbeiten </button></li>
+          <li> <button type="button" class="btn btn-primary" onclick="LogoutButton_Click" style="background-color:#fff;color:#043381"<img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff;"/>Logout</button></li>
           </ul>
                  </div>                                                     
                        </li>
@@ -324,14 +324,14 @@
                                                      </button>
                                                     <a class="navbar-brand" id="navbarhomebar" href="../newpageJulius_Sidebar.aspx"><img src="../images/Logo_small.png" style="width:90%;height:90%;" alt="VERAG Spedition AG Logo with blue word color until grey AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"></a>                                                                                                                                                           
                                              
-                                            <div class="dropdown" style="background-color:#fff; color:#043381;position:absolute;right:5%;top:15%;z-index:1031">
+                                            <div class="dropdown" id="dropdownbtnmain">
                                               <button class="dropbtn" style="background-color:#fff;color:#043381;border:none;z-index:1031; position:absolute"
-                                      <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381"><img src="../images/samples/default-avatar.jpg"; width="15"; /><a  data-bs-toggle="modal" data-bs-target="#exampleModal" <asp:LoginName class="pointer" ID="LoginName1" runat="server" style="margin-left:6px"/></a></button>
+                                      <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381"><img src="../images/samples/default-avatar.jpg"; width="7"; /><a  data-bs-toggle="modal" data-bs-target="#exampleModal" <asp:LoginName class="pointer" ID="LoginName1" runat="server" style="margin-left:6px"/></a></button>
                                               </button>
                                                 
-                                              <div class="dropdown-content" style="margin-right:-25%;margin-top:2%">                           
-                                                             <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff; color:#043381;"><img src="../images/Icons/main/gear_blue.png"; style="width:15px; height:15px;color:#043381;background-color:#fff;margin-right:6px;" />Profil bearbeiten</button>                                                                
-                                                             <button type="button" onclick="LogoutButton_Click" style="text-decoration: none;background-color:#fff;color:#043381"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button>                        
+                                              <div class="dropdown-content" id="dropdownmenueuser">                           
+                                                             <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff; color:#043381;text-align:left;border:none"><img src="../images/Icons/main/gear_blue.png"; style="width:15px; height:15px;color:#043381;background-color:#fff;margin-right:6px;" />Profil bearbeiten</button>                                                                
+                                                             <button type="button" onclick="LogoutButton_Click" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button>                        
                                                         <!-- <div class="dropdown-divider"></div>-->                                                                       
        </div>    </div>   
                                             
@@ -459,14 +459,14 @@
                                               </div>
                                 </div>
                                    
-                                    <div class="dropdown" style="background-color:#fff; color:#043381;position:absolute;right:5%;top:15%;z-index:1031">
+                                    <div class="dropdown" id="dropdownbtnmain" style="background-color:#fff; color:#043381;position:absolute;right:5%;top:2%;z-index:1031">
                                               <button class="dropbtn" style="background-color:#fff;color:#043381;border:none;z-index:1031; position:sticky"
                                       <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381"><img src="../images/samples/default-avatar.jpg"; width="15"; /><asp:LoginName class="pointer" ID="LoginName2" runat="server" style="margin-left:6px"/></button>
                                               </button>
                                                 
-                                              <div class="dropdown-content" style="margin-right:-25%;margin-top:2%">                           
-                                                             <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff; color:#043381;"><img src="../images/Icons/main/gear_blue.png"; style="width:15px; height:15px;color:#043381;background-color:#fff;margin-right:6px;" />Profil bearbeiten</button>                                                                                                                                  
-                                                             <button type="button" onclick="LogoutButton_Click" style="text-decoration: none;background-color:#fff;color:#043381"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button>                       
+                                              <div class="dropdown-content" id="dropdownmenueuser" >                           
+                                                             <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381;text-align:left" ><img src="../images/Icons/main/gear_blue.png"; style="width:15px; height:15px;color:#043381;background-color:#fff;margin-right:6px;" />Profil bearbeiten </button>                                                                                                                      
+                                                             <button type="button"class="btn btn-primary"  onclick="LogoutButton_Click" style="background-color:#fff;color:#043381;text-align:left"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button>                       
                                                         <!-- <div class="dropdown-divider"></div>-->                                                                       
        </div>    </div>   
                    </nav> </div>   
diff --git a/css/Customers/MasterpageCustomers.css b/css/Customers/MasterpageCustomers.css
index aad3e99..4c3121f 100644
--- a/css/Customers/MasterpageCustomers.css
+++ b/css/Customers/MasterpageCustomers.css
@@ -168,6 +168,24 @@ ContentPlaceHolder1 {
         color: #043381;
         font-size: 22px;
     }
+    .pointer {
+        cursor: pointer;
+    }
+
+    #dropdownmenueuser {
+        margin-right: -28%;
+        margin-top: 9%
+    }
+
+    #dropdownbtnmain {
+        background-color: #fff;
+        color: #043381;
+        position: absolute;
+        right: 4%;
+        top: 0%;
+        z-index: 1031;
+        height:12px;
+    }
 }
 
 @media (min-width: 575px)  and (max-width: 768px) {
@@ -260,8 +278,23 @@ ContentPlaceHolder1 {
         z-index: 1031;
         position: relative;
     }
+    .pointer {
+        cursor: pointer;
+    }
+    #dropdownmenueuser {
+        margin-right: -28%;
+        margin-top: 0%
+    }
+    #dropdownbtnmain {
+        background-color: #fff;
+        color: #043381;
+        position: absolute;
+        right: 4%;
+        top: 8%;
+        z-index: 1031
+    }
 }
-@media (min-width: 575px) {
+@media (min-width: 768px) {
     body {
         font-family: 'Poppins', sans-serif;
         background: #fafafa;
@@ -358,6 +391,18 @@ ContentPlaceHolder1 {
     .pointer {
         cursor:pointer;
     }
+    #dropdownmenueuser {
+        margin-right: -25%;
+        margin-top: -2%
+    }
+    #dropdownbtnmain {
+        background-color: #fff;
+        color: #043381;
+        position: absolute;
+        right: 4%;
+        top: 4%;
+        z-index: 1031
+    }
 }
     #ContentPlaceHolder1 {
         align-self: center;