Merge branch 'master' of https://git.dz-co.de/danzim/alina

5 years ago · f3d9e9c61f
40 changed files with 18 additions and 15 deletions
--- a/2
+++ b/2
@ -0,0 +1,2 @@
+FROM nginx
+COPY site /usr/share/nginx/html
--- a/site/Bilder/6c8dc6ec-538c-4fa0-b2c1-df318e4941fe.JPG
+++ b/site/Bilder/6c8dc6ec-538c-4fa0-b2c1-df318e4941fe.JPG
--- a/site/Bilder/Abel.jpg
+++ b/site/Bilder/Abel.jpg
--- a/site/Bilder/Haeusler.jpg
+++ b/site/Bilder/Haeusler.jpg
--- a/site/Bilder/Hans.jpg
+++ b/site/Bilder/Hans.jpg
--- a/site/Bilder/Helene2.JPG
+++ b/site/Bilder/Helene2.JPG
--- a/site/Bilder/Hoffmeister.jpg
+++ b/site/Bilder/Hoffmeister.jpg
--- a/site/Bilder/Kost.jpg
+++ b/site/Bilder/Kost.jpg
--- a/site/Bilder/Kraushaar.jpg
+++ b/site/Bilder/Kraushaar.jpg
--- a/site/Bilder/Loch.jpg
+++ b/site/Bilder/Loch.jpg
--- a/site/Bilder/Martin.jpg
+++ b/site/Bilder/Martin.jpg
--- a/site/Bilder/Mueller.jpg
+++ b/site/Bilder/Mueller.jpg
--- a/site/Bilder/Obenauf.jpg
+++ b/site/Bilder/Obenauf.jpg
--- a/site/Bilder/Pistor.jpg
+++ b/site/Bilder/Pistor.jpg
--- a/site/Bilder/R63837fdbe2c77a1f2a561b9d45940018.jpg
+++ b/site/Bilder/R63837fdbe2c77a1f2a561b9d45940018.jpg
--- a/site/Bilder/Schleicher.jpg
+++ b/site/Bilder/Schleicher.jpg
--- a/site/Bilder/Schmitz.jpg
+++ b/site/Bilder/Schmitz.jpg
--- a/site/Bilder/Sesselmann.jpg
+++ b/site/Bilder/Sesselmann.jpg
--- a/site/Bilder/Somos.jpg
+++ b/site/Bilder/Somos.jpg
--- a/site/Bilder/Voigt.jpg
+++ b/site/Bilder/Voigt.jpg
--- a/site/Bilder/logo.jpg
+++ b/site/Bilder/logo.jpg
--- a/site/Forschung.html
+++ b/site/Forschung.html
@ -10,7 +10,7 @@
  <div class="menu-bar">
      <ul>
        <li>Sonneberger Persönlichkeiten</li>
-        <li><a href="#">Start</a></li>
+        <li><a href="index.html">Start</a></li>
        <li><a href="Politik.html">Politik</a>


--- a/site/Gesundheitswesen.html
+++ b/site/Gesundheitswesen.html
@ -10,7 +10,7 @@
  <div class="menu-bar">
      <ul>
        <li>Sonneberger Persönlichkeiten</li>
-        <li><a href="#">Start</a></li>
+        <li><a href="index.html">Start</a></li>
        <li><a href="Politik.html">Politik</a>


--- a/site/Politik.docx
+++ b/site/Politik.docx
--- a/site/Politik.html
+++ b/site/Politik.html
@ -10,7 +10,7 @@
  <div class="menu-bar">
      <ul>
        <li>Sonneberger Persönlichkeiten</li>
-        <li><a href="#">Start</a></li>
+        <li><a href="index.html">Start</a></li>
        <li><a href="Politik.html">Politik</a>


@ -54,7 +54,7 @@
        <div class="Panel1">

 <div class="pb1">
-          <img src="Bilder/Abel.jpg" alt="Voigt",height="180", width="280">
+          <img src="Bilder/Abel.jpg" alt="Abel",height="180", width="280">
      </div>
 			<br>
        <p><strong>Name</strong></p>
--- a/site/Son1.jpg
+++ b/site/Son1.jpg
--- a/site/Son2.jpg
+++ b/site/Son2.jpg
--- a/site/Son3.jpg
+++ b/site/Son3.jpg
--- a/site/Sport.html
+++ b/site/Sport.html
@ -10,7 +10,7 @@
  <div class="menu-bar">
      <ul>
        <li>Sonneberger Persönlichkeiten</li>
-        <li><a href="#">Start</a></li>
+        <li><a href="index.html">Start</a></li>
        <li><a href="Politik.html">Politik</a>


--- a/site/Texte/.DS_Store
+++ b/site/Texte/.DS_Store
--- a/site/Texte/Webside
+++ b/site/Texte/Webside
--- a/site/Texte/Webside
+++ b/site/Texte/Webside
--- a/site/Texte/Webside
+++ b/site/Texte/Webside
--- a/site/Texte/Wirtschaft
+++ b/site/Texte/Wirtschaft
--- a/site/Texte/Wirtschaft
+++ b/site/Texte/Wirtschaft
--- a/site/Texte/Wirtschaft
+++ b/site/Texte/Wirtschaft
--- a/site/Wirtschaft.html
+++ b/site/Wirtschaft.html
@ -10,7 +10,7 @@
  <div class="menu-bar">
      <ul>
        <li><a href="">Sonneberger Persönlichkeiten</a> </li>
-        <li><a href="#">Start</a></li>
+        <li><a href="index.html">Start</a></li>
        <li><a href="Politik.html">Politik</a>


@ -40,7 +40,7 @@

 	  <div class="Panel1">
 		  <div class="pb1">
-			  <img src="Bilder/Kost.JPG"  alt="", width="200">
+			  <img src="Bilder/Kost.jpg"  alt="", width="200">
 		  </div>
 	  <br>
 <p><strong>Name</strong></p>
@ -76,7 +76,7 @@
 	  </div>
 <div class="Panel1">
 		  <div class="pb1">
-<img src="Bilder/Hans.JPG"  alt="", width="200">
+<img src="Bilder/Hans.jpg"  alt="", width="200">
 		  </div>
 	<br>
 	  <p><strong>Name</strong></p>
@ -111,7 +111,7 @@

 <div class="Panel1">
 		  <div class="pb1">
-			  <img src="Bilder/Martin.JPG" alt="", width="200">
+			  <img src="Bilder/Martin.jpg" alt="", width="200">

 		  </div>
 	<br>
--- a/site/index.html
+++ b/site/index.html
@ -10,7 +10,7 @@
  <div class="menu-bar">
      <ul>
        <li>Sonneberger Persönlichkeiten</li>
-        <li><a href="#">Start</a></li>
+        <li><a href="index.html">Start</a></li>
        <li><a href="Politik.html">Politik</a>


@ -40,10 +40,11 @@
 <div class="bg">

 </div>
-	  <div class="video">
-<video src="movie.mp4" autoplay poster=""></video>
-	</div>

+<video controls autoplay>
+  <source src="movie.mp4" type="video/mp4">
+  Your browser does not support the video tag.
+</video>

  </body>
 </html>
--- a/site/movie.mp4
+++ b/site/movie.mp4
--- a/site/styles.css
+++ b/site/styles.css
@ -79,8 +79,8 @@ body{
    }
    
    .Panel1 p{
-		
-		margin-left: 20px;
+			
+      margin-left: 20px;
      display: block;
      text-align: left;
    }