Merge remote-tracking branch 'origin/dani' into dev

svenbledt · Nov 29, 2022 · fc437b0 · fc437b0
2 parents 28ecaf1 + 81e577e
commit fc437b0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/about.html b/about.html
@@ -101,12 +101,12 @@ <h2>Das beste Spiel das es gibt. Ich weis das du es weisst.</h2>
 
       <div id="company" class="container p-1 my-5 text-danger">
 
-        <div class="container-xl col-md-2 p-2 my-2">
+        <div class="Helden container-xl col-md-2 p-2 my-2">
           <h1>Firma</h1>
         </div>
         <div class="d-flex container-lg col-md-12 p-5" >
-          <iframe id="googel" class="col-6 image-container mx-auto d-block" src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2702.485533721894!2d8.51202031237121!3d47.363441371048395!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x4790098ca9252865%3A0x7339eea41015370e!2sR%C3%A4ffelstrasse%2012%2C%208045%20Z%C3%BCrich!5e0!3m2!1sde!2sch!4v1669548033624!5m2!1sde!2sch" width="600" height="450" style="border:0;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe>
-          <img class="col-6 image-container mx-auto d-block" src="assets/img/about/company.jpg">
+          <iframe id="googel" class="Helden col-6 image-container mx-auto d-block" src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2702.485533721894!2d8.51202031237121!3d47.363441371048395!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x4790098ca9252865%3A0x7339eea41015370e!2sR%C3%A4ffelstrasse%2012%2C%208045%20Z%C3%BCrich!5e0!3m2!1sde!2sch!4v1669548033624!5m2!1sde!2sch" width="600" height="450" style="border:0;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe>
+          <img class=" col-6 image-container mx-auto d-block" src="assets/img/about/company.jpg">
         </div>
       </div>
     </section
@@ -198,7 +198,7 @@ <h5>99998 Neon-City</h5>
           </div>
 
           <div class="container-xl col-lg-6  justify-content-center  bg-black text-white">
-            <img class="image-container img-fluid" src="assets/img/about/held.jpg" /> 
+            <img class="Helden image-container img-fluid" src="assets/img/about/held.jpg" /> 
             <div class="container-xl col-md-2 p-2 my-2 text">
               <h1>Helden</h1>
             </div>
@@ -246,7 +246,7 @@ <h5>99999 Neon-City</h5>
         </div>
 
         <div class="Helden container-fluid col-lg-3 bg-black" >
-          <div id="kontaktBild" class="row">
+          <div id="kontaktBild" class="row ">
             <img class="image-container mx-auto d-block" src="assets/img/about/Akram.jpg" />
           </div>
           <div id="kontaktDaten">
@@ -386,4 +386,4 @@ <h4>Unsere Neuigkeiten</h4>
 </body>
 
 </html>
-<!-- Sven END -->
+<!-- Sven END --> 
diff --git a/assets/css/style.css b/assets/css/style.css
@@ -875,6 +875,7 @@ z-index: -1;
 }
 #Karte{background-image: url("../img/about/acjpg2.jpg");background-origin: padding-box;
 }
+.Helden{ min-height: 100px; min-width:100px;}
 /*
 #kontaktDaten {
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -875,6 +875,7 @@ z-index: -1; @@
     }
     #Karte{background-image: url("../img/about/acjpg2.jpg");background-origin: padding-box;
     }
+    .Helden{ min-height: 100px; min-width:100px;}
     /*
     #kontaktDaten {
     }
@@ Expand Down @@