Skip to content

Commit

Permalink
Merge pull request #251 from ratnojitsaha/FIXING_MESS
Browse files Browse the repository at this point in the history 
TEST MERGE!!
  • Loading branch information
@apu52
apu52 authored Feb 3, 2024
2 parents c0b5e7a + 48519a7 commit d5a257e
Show file tree
Hide file tree
Showing 3 changed files with 289 additions and 34 deletions.
69 changes: 62 additions & 7 deletions dedicated destinations/Santorini ,Aegean Sea/start.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Tourguide</title>
<link rel="stylesheet" href="./tour.css">
<link rel="stylesheet" href="/styles.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
</head>
<body>
Expand All @@ -29,20 +28,20 @@
<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>

<ul class="navLinks">
<li class="link" data-aos="fade-down"><a href="/index.html#Home">Home</a></li>
<li class="link home" data-aos="fade-down"><a href="/index.html#Home">Home</a></li>
<li class="link" data-aos="fade-down"><a href="/index.html#Destinations">Destinations</a></li>
<li class="link" data-aos="fade-down"><a href="/index.html#trip">Pricing</a></li>
<li class="link" data-aos="fade-down"><a href="/index.html#testimonials">Testimonials</a></li>
<li class="link" data-aos="fade-down"><a href="/index.html#ReviewGallery">Reviews</a></li>
<li class="link" data-aos="fade-down"><a href="/feedback.html">Rate Us?</a></li>
<li class="link" data-aos="fade-down"><a href="/login.html">Login</a></li>
</ul>
<button id="toggle" data-aos="fade-down" style="display: inline-block;" class="aos-init aos-animate" fdprocessedid="4jppko">Dark Theme</button>
<a href="#contact" class="contact-btn">

<a href="/index.html#contact" class="contact-btn">
<button class="btn aos-init aos-animate" id="btn-style" style="margin: 0;" data-aos="fade-down" fdprocessedid="kglas">Contact Us</button>
</a>
<div class="hamburger" data-aos="fade-down">
<div class="line"></div>
<div class="line"></div>
<div class="line"></div>
<div class="line"></div>
</div>
Expand Down Expand Up @@ -110,8 +109,64 @@ <h1><u>Description</u></h1> <br>

</section>


</body>
<footer class="footer" data-aos="fade-up">
<div class="section__container footer__container">
<div class="footer__col">
<h3>Tourguide<span>.</span></h3>
<p>
Explore your suitable and dream places around the world. Here you
can find your right destination.
</p>
</div>
<div class="footer__col">
<h4>Support</h4>
<a href="./faq.html" style="color: inherit; text-decoration: none;">
<p style="color: inherit;">FAQs</p>
</a>
<a href="./tnc.html"><p>Terms & Conditions</p></a>
<a href="./privacy.html"><p>Privacy Policy</p></a>
<p>Contact Us</p>
</div>
<div class="footer__col">
<h4>Address</h4>
<div class="mapouter">
<div class="gmap_canvas"><iframe width="200" height="200" id="gmap_canvas"
src="https://maps.google.com/maps?q=wellington%20street%20kolkata&t=k&z=11&ie=UTF8&iwloc=&output=embed"
frameborder="0" scrolling="no" marginheight="0" marginwidth="0"></iframe><a
href="https://embedgooglemap.net/124/">invincible 123movies</a><br>
<style>
.mapouter {
position: relative;
text-align: right;
height: 200px;
width: 200px;
}
</style><a href="https://www.embedgooglemap.net">embed google map on website</a>
<style>
.gmap_canvas {
overflow: hidden;
background: none !important;
height: 200px;
width: 200px;
}
</style>
</div>
</div>
</div>
<div class="footer__col">
<h4>Reach Out To Us</h4>
<p><span>Email:</span> [email protected]</p>
<p><span>Phone:</span> +91 8562145852</p>
</div>
</div>
<div class="footer__bar">
Copyright © 2023 Arpan Chowdhury. All rights reserved.
</div>
</footer>

<script src="main.js"></script>

</body>


</html>
202 changes: 201 additions & 1 deletion dedicated destinations/Santorini ,Aegean Sea/tour.css
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/*css/style.css */
body{
margin: 0;
}

.slider{
margin:120px 50px;
Expand Down Expand Up @@ -51,6 +54,7 @@

.middle{
display: flex;
margin-top: rem;
}

.right-section{
Expand Down Expand Up @@ -94,7 +98,7 @@
}

#btnss{
margin-left: 4.5rem;
margin-left: 4rem;
padding: 11px 45px ;
}

Expand Down Expand Up @@ -143,8 +147,204 @@
ul {
margin-top: 0;
margin-bottom: 1rem;

}
ol, ul {
padding-left: 2rem;

}

.footer {
width: 100%;
background-color: #091020;
color: white;
}

.footer__container {
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
align-items: flex-start;
/*grid-template-columns: repeat(3, 1fr);*/
gap: 24px;
color: var(--secondary-color);
}

.footer__col {
flex: 1;
max-width: 200px;
margin: 10px;
text-align: center;
flex-direction: column;
}

.footer__col:nth-child(2) {
margin-top: 10px;
}

.footer__col h3 {
font-size: 1.5rem;
font-weight: 600;
margin-bottom: 20px;
}

.footer__col h3 span {
color: var(--primary-color);
}

.footer__col p {
font-size: 0.8rem;
cursor: pointer;
transition: 0.3s;
}

.footer__col p:hover {
color: #ff0000;
font-size: 15px;
}

.footer__col p span {
font-weight: 600;
}

.footer__col h4 {
font-size: 1rem;
font-weight: 600;
margin-bottom: 10px;
}

.footer__bar {
max-width: var(--max-width);
margin: auto;
padding: 0.5rem;
text-align: center;
font-size: 0.8rem;
/* color: var(--secondary-color); */
color: var(--extra-light);
border-top: 1px solid var(--text-light);
}

/*NAV CODE------*/
.nav-container {
height: auto;
width: 100%;
display: flex;
justify-content: flex-start;
align-items: center;
position: fixed;
left: 0;
z-index: 9999;
}

.newNav {
display: flex;
justify-content: space-around;
align-items: center;
gap: 0.5rem;
height: auto;
width: 100%;
padding: 1rem 2rem;
}

.navLinks {
display: flex;
justify-content: center;
align-items: center;
font-size: 1.2rem;
list-style: none;
gap: 1.2rem;
position: relative;
top: 0.5rem;
z-index: 10;
}

.link a {
position: relative;
color: white;
font-family: Poppins;
text-decoration: none;
font-weight: bold;
}

.link a::before {
position: absolute;
content: '';
height: 2px;
width: 0%;
bottom: -5px;
left: 0;
background-color: red;
}

.link a::after {
position: absolute;
content: '';
height: 2px;
width: 0%;
top: -5px;
right: 0;
background-color: red;
transition: all 0.2s ease-in-out;
}

.link a:hover::before {
width: 100%;
transition: all 0.2s ease-in-out;
}

.link a:hover::after {
width: 100%;
transition: all 0.2s ease-in-out;
}

.hamburger {
height: 2rem;
width: 1.7rem;
display: flex;
justify-content: space-between;
flex-direction: column;
display: none;
transition: 0.2s;
}

.line {
height: 5px;
width: 100%;
background-color: white;
border-radius: 2px;
}

@media screen and (max-width : 1220px) {
.hamburger {
display: flex;
cursor: pointer;
}

.navLinks {
position: absolute;
top: 70px;
background-color: #091020;
width: 0%;
left: 0;
height: 100vh;
padding: 2rem 0;
flex-direction: column;
transition: 0.2s;
overflow: hidden;
}

.navLinks li {
width: 100%;
padding: 0.5rem 0;
background-color: #1f2532;
z-index: 10;
}

#toggle {
font-size: 0.6rem;
}

#btn-style {
font-size: 0.6rem;
}
}
52 changes: 26 additions & 26 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,32 +75,32 @@
<button id="toggle" data-aos="fade-down">Dark Theme</button>
<a href="#contact"><button class="btn" id="btn-style">Contact Us</button></a>
</nav> -->
<div class="nav-container">
<nav class="newNav">
<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>

<ul class="navLinks">
<li class="link home" data-aos="fade-down"><a href="#Home">Home</a></li>
<li class="link" data-aos="fade-down"><a href="#AboutUs">AboutUs</a></li>
<li class="link" data-aos="fade-down"><a href="#Destinations">Destinations</a></li>
<li class="link" data-aos="fade-down"><a href="#trip">Pricing</a></li>
<li class="link" data-aos="fade-down"><a href="#ReviewGallery">Trip Gallery</a></li>
<li class="link" data-aos="fade-down"><a href="#testimonials">Testimonials</a></li>
<li class="link" data-aos="fade-down"><a href="feedback.html">Rate Us?</a></li>
<li class="link" data-aos="fade-down"><a href="#contact">Contact Us</a></li>

</ul>
<a href="newLogin.html" class="contact-btn"><button class="btn" id="btn-style" style="margin: 0;" data-aos="fade-down">Login</button></a>
<div class="toggle-container" data-aos="fade-down">
<input id="themeToggle" class="toggle" type="checkbox">
</div>
<div class="hamburger" data-aos="fade-down">
<div class="line"></div>
<div class="line"></div>
<div class="line"></div>
</div>
</nav>
</div>
<div class="nav-container">
<nav class="newNav">
<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>
<ul class="navLinks">
<li class="link home" data-aos="fade-down"><a href="#Home">Home</a></li>
<li class="link" data-aos="fade-down"><a href="#AboutUs">AboutUs</a></li>
<li class="link" data-aos="fade-down"><a href="#Destinations">Destinations</a></li>
<li class="link" data-aos="fade-down"><a href="#trip">Pricing</a></li>
<li class="link" data-aos="fade-down"><a href="#ReviewGallery">Trip Gallery</a></li>
<li class="link" data-aos="fade-down"><a href="#testimonials">Testimonials</a></li>
<li class="link" data-aos="fade-down"><a href="feedback.html">Rate Us?</a></li>
<li class="link" data-aos="fade-down"><a href="#contact">Contact Us</a></li>
</ul>
<a href="newLogin.html" class="contact-btn"><button class="btn" id="btn-style" style="margin: 0;" data-aos="fade-down">Login</button></a>
<div class="toggle-container" data-aos="fade-down">
<input id="themeToggle" class="toggle" type="checkbox">
</div>
<div class="hamburger" data-aos="fade-down">
<div class="line"></div>
<div class="line"></div>
<div class="line"></div>
</div>
</nav>
</div>
<header>
<section class="section__container header__container" id="Home">
<div class="header__image" data-aos="fade-down-right">
Expand Down

0 comments on commit d5a257e

Please sign in to comment.