From 2d517961a944d8c551c5496351a5172e1ac52865 Mon Sep 17 00:00:00 2001
From: thewarrior1220 <hatvanitamas09@gmail.com>
Date: Fri, 18 Feb 2022 09:30:37 +0100
Subject: [PATCH] merge fix fiam

---
 index.html | 48 ++++++++++++++++++++++++------------------------
 style.css  | 18 +++++++++++-------
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/index.html b/index.html
index ad77efd..0b6e441 100644
--- a/index.html
+++ b/index.html
@@ -26,32 +26,32 @@
                 </div>
             </nav>
             <!-- Carousel -->
-            <div id="demo" class="carousel slide" data-bs-ride="carousel">
+            <div id="carousel" class="carousel slide" data-bs-ride="carousel">
             
                 <!-- Indicators/dots -->
                 <div class="carousel-indicators">
-                  <button type="button" data-bs-target="#demo" data-bs-slide-to="0" class="active"></button>
-                  <button type="button" data-bs-target="#demo" data-bs-slide-to="1"></button>
-                  <button type="button" data-bs-target="#demo" data-bs-slide-to="2"></button>
+                  <button type="button" data-bs-target="#carousel" data-bs-slide-to="0" class="active"></button>
+                  <button type="button" data-bs-target="#carousel" data-bs-slide-to="1"></button>
+                  <button type="button" data-bs-target="#carousel" data-bs-slide-to="2"></button>
                 </div>
             
                 <!-- The slideshow/carousel -->
                 <div class="carousel-inner">
                   <div class="carousel-item active">
-                    <img src="res/test pics/1151707.jpg" alt="Los Angeles" class="d-block w-100">
+                    <img src="res/bereg/1.png" alt="Los Angeles" class="kep d-block w-75">
                   </div>
                   <div class="carousel-item">
-                    <img src="res/test pics/1168140.jpg" alt="Chicago" class="d-block w-100">
+                    <img src="res/bereg/2.png" alt="Chicago" class="kep d-block w-75">
                   </div>
                   <div class="carousel-item">
-                    <img src="res/test pics/1168382.jpg" alt="New York" class="d-block w-100">
+                    <img src="res/bereg/3.png" alt="New York" class="kep d-block w-75">
                   </div>
                 </div>
                 <!-- Left and right controls/icons -->
-                <button class="carousel-control-prev" type="button" data-bs-target="#demo" data-bs-slide="prev">
+                <button class="carousel-control-prev" type="button" data-bs-target="#carousel" data-bs-slide="prev">
                   <span class="carousel-control-prev-icon"></span>
                 </button>
-                <button class="carousel-control-next" type="button" data-bs-target="#demo" data-bs-slide="next">
+                <button class="carousel-control-next" type="button" data-bs-target="#carousel" data-bs-slide="next">
                   <span class="carousel-control-next-icon"></span>
                 </button>
             </div>
@@ -62,7 +62,7 @@
                 <iframe id="facebook"></iframe>
             </aside>
             <aside id="right">
-                <iframe id="instagramm"></iframe>
+                <iframe id="instagram"></iframe>
             </aside>
             <div id="idezetek">
                 <!--Idezetek helye-->
@@ -71,20 +71,20 @@
                 <div id="map"></div>
                 <div><!--Map melletti elerhetosegek (lehet tablazat)--></div>
                 <div>
-                <h1 class="partner">Partnereink</h1>
-                <div>
-                <img class="b" src="Beregszasziproject-main/logók/ikk_360aa14c2e_95f9c4371f.png">
-                <img class="m" src="Beregszasziproject-main/logók/thumbnail_NSZFH_logo_black_top_20528d7f88.png">
-                <img class="n" src="Beregszasziproject-main/logók/thumbnail_ITM_logo_1100x480_440bb2bcb5.jpg">
-                </div>
-                <br><br>
-                <br><br>
-                <br><br>
-                <div>
-                <img class="o" src="Beregszasziproject-main/logók/itmlogo_bj_8775770659_b445975eab.png" >
-                <img class="i" src="Beregszasziproject-main/logók/dkv_db4ff56201.png">
-                <img class="u" src="Beregszasziproject-main/logók/faceb_uj_deeaf3a2c7.png">
-                </div>
+                  <h1 class="partner">Partnereink</h1>
+                  <div>
+                    <img class="b" src="Beregszasziproject-main/logók/ikk_360aa14c2e_95f9c4371f.png">
+                    <img class="m" src="Beregszasziproject-main/logók/thumbnail_NSZFH_logo_black_top_20528d7f88.png">
+                    <img class="n" src="Beregszasziproject-main/logók/thumbnail_ITM_logo_1100x480_440bb2bcb5.jpg">
+                  </div>
+                  <br><br>
+                  <br><br>
+                  <br><br>
+                  <div>
+                    <img class="o" src="Beregszasziproject-main/logók/itmlogo_bj_8775770659_b445975eab.png" >
+                    <img class="i" src="Beregszasziproject-main/logók/dkv_db4ff56201.png">
+                    <img class="u" src="Beregszasziproject-main/logók/faceb_uj_deeaf3a2c7.png">
+                  </div>
                 </div>
                 <div id="also footer"></div>
             </footer>
diff --git a/style.css b/style.css
index 1ae8e27..c7a47b8 100644
--- a/style.css
+++ b/style.css
@@ -10,25 +10,29 @@ li{
 }
 
 ul{
-  margin-left: 20%;
+  /*margin-left: 20%;*/
 }
 
 li{
-  border-top: 1px solid black;
-  border-bottom: 1px solid black;
+
 }
 li:first-child{
-  border-left: 1px solid black;
+  border-left: 1px solid white;
+  margin-left: 20%;
 }
 li:last-child{
-  border-right: 1px solid black;
+  border-right: 1px solid white;
 }
 
 nav{
   color: white;
-  background-color: black;
+  background-color: rgb(49, 49, 49);
   float: left;
-  margin-left: 25%;
+  width: 100%;
+}
+
+.kep{
+  margin-left: 13%;
 }
 
 .partner{