From 48fe0441dfb2aa02c65864fb51908915ae7053e1 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Fri, 3 Sep 2021 14:56:08 +0200
Subject: [PATCH] =?UTF-8?q?Hauptmen=C3=BC=20buttons=20angepasst=20in=20lay?=
 =?UTF-8?q?out=20Ausrichtung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/Customers.master | 24 ++++++++++++++----------
 Customers/Welcome.aspx     |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Customers/Customers.master b/Customers/Customers.master
index 9dc9962..d7908e2 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -125,8 +125,12 @@
                 });
             });
         </script>          
-        <style>       
-    </style>         
+        <style>
+        dropbtnbtnbtn{
+            color:#043381;
+            background-color:#fff;
+        }
+    </style>       
          <link rel="stylesheet" type="text/css" href="../css/style.css"/>
          <link rel="stylesheet" type="text/css" href="../css/Dropdown.css"/>
          <link rel="stylesheet" type="text/css" href="../css/Customers/MasterpageCustomers.css"/>  
@@ -249,7 +253,7 @@
                                                              <!--  </ul>-->
                                                         </li>                
                                                         <li>
-                                                          <a href="#UserSubmenu1" data-bs-toggle="collapse" aria-expanded="false" class="dropdown-toggle">User: <%=Me.Page.User.Identity.Name %></a>                        
+                                                          <a href="#UserSubmenu1" data-bs-toggle="collapse" aria-expanded="false" class="dropdown-toggle">Benutzerprofil</a>                        
                                                             <ul style="list-style: none;"class="collapse list-unstyled" id="UserSubmenu1">
                                                                     <span class="navbar-toggler-icon"></span>                                                                
                                                                     <li>  <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;"><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>                                                              
@@ -265,8 +269,8 @@
             <div class="modal-dialog">
                     <div class="modal-content">
                         <div class="modal-header">
-                                 <h5 class="modal-title" id="exampleModalLabel">Profil: User: <%=Me.Page.User.Identity.Name %></h5>
-                                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                            <h5 class="modal-title" id="exampleModalLabel">Profil: User: <%=Me.Page.User.Identity.Name %></h5>
+                            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                        </div>
                        <div class="modal-body">                                                                                                                              
                             <div class="container-fluid" style="padding:2px 2px 2px 2px"><center>
@@ -422,19 +426,19 @@
                                    
                                   
              
-                                           <div class="dropdown" id="dropdownbtnmain"  style="position: absolute; top:-20px; right:170px; width:30px;z-index:1032">
-                                              <button class="dropbtn" id="dropbtnbtnbtn" style="height:50px; width:120px"
+                                           <div class="dropdown" id="dropdownbtnmain"  style="position: absolute; top:-20px; right:104px; width:30px;z-index:1032">
+                                              <button class="dropbtn" id="dropbtnbtnbtn" style="height:50px; width:120px;right:-104px"
                                                   <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381; width:30px;height:50px"><img src="../images/samples/default-avatar.jpg"; width="15"; /><a  data-bs-toggle="modal" data-bs-target="#exampleModal"><asp:LoginName class="pointer" ID="LoginName2" runat="server" style="margin-left:6px"/></a></button>
                                               </button>                                                
-                                              <ul class="dropdown-content" id="dropdownmenuecont" style="top:50px;z-index:1032">                           
+                                              <ul class="dropdown-content" id="dropdownmenuecont" style="width:120px;top:50px;z-index:1032">                           
                                                            <li>  <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;"><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" onclick="LogoutButton_Click" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;"><img src="../images/Icons/main/Logout.svg.png"; style="width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button>   </li>                     
                                                         <!-- <div class="dropdown-divider"></div>-->                                                                       
        </ul></div>  
 
-                                   <div class="dropdown" id="langbutmenu" style="background-color:#fff; color:#043381;position:absolute;top:17%;right:170px;z-index:1031">
+                                   <div class="dropdown" id="langbutmenu" style="background-color:#fff; color:#043381;position:absolute;top:17%;right:104px;z-index:1031">
                                               <button class="dropbtn" id="dropbtnlang" style="color:#043381;background-color:#fff;position:absolute;top:17%;z-index:1031"><center><img id="myImage" src="../<%=flagpath%>" style="border:1px solid #fff;width:32px; justify-items:center;" alt="Logo Schriftzug: Verag Spedition AG Blaue Schrift: Verag Spedition Graue Schrift: AG" /></center></button>
-                                              <div class="dropdown-content" id="langdropdown" style="position:absolute;top:2%;z-index:1031">     
+                                              <div class="dropdown-content" id="langdropdown" style="position:absolute;top:2%;right:-104px;z-index:1031">     
                                                   <%  Dim stringDE = "&nbsp  DE"
                                                       Dim stringEN = "&nbsp  EN"
                                                       Dim stringBIH = "&nbsp BIH"
diff --git a/Customers/Welcome.aspx b/Customers/Welcome.aspx
index ba4f376..7da4df9 100644
--- a/Customers/Welcome.aspx
+++ b/Customers/Welcome.aspx
@@ -28,7 +28,7 @@
     <link rel="stylesheet" type="text/css" href="../css/Customers/MasterpageCustomers.css"/>              
     <link rel="stylesheet" type="text/css" href="../css/Customers/Welcome.css"/> 
     <link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css"/>          
-     
+    
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">