merge fix fiam

This commit is contained in:
2022-02-18 09:30:37 +01:00
parent b009c15bfe
commit 2d517961a9
2 changed files with 35 additions and 31 deletions

View File

@@ -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-->

View File

@@ -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{