Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Logo rendering and fix styles #1637

Merged
merged 3 commits into from
Nov 10, 2024
Merged

fix: Logo rendering and fix styles #1637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9befc88
Redirecting links are fixed and logo is synchronised across the website
Zubaida0113 Nov 9, 2024
0906964
Fix-login-styles-across-all-pages
Zubaida0113 Nov 9, 2024
3eed373
Fix logo on dedicated destinations
Zubaida0113 Nov 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions about.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ body, html {
align-items: center;
min-height: 100vh;
padding: 40px;
padding-top: 110px;
text-align: center;
background-color: rgba(0, 0, 0, 0.6);
}
Expand Down
36 changes: 20 additions & 16 deletions about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@

<div class="nav-container" id="top">
<nav class="newNav">
<div style="display: flex; flex-direction: row; align-items: center;">
<img src="/favicon.ico" class="sitelogo">
<div style="display: flex; flex-direction: row; align-items: center; ">
<img src="favicon.ico" class="sitelogo">

<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>
</div>

<ul class="navLinks">
<ul class="navLinks" style="gap: 1.2rem;">
<li class="link" id="View-link" data-aos=""><a href="mapa.html">View</a></li>
<li class="link" id="LogIn-link" data-aos=""><a href="newLogin.html">Log In</a></li>
<li class="link" data-aos=""><a href="./index.html">Home</a></li>
Expand All @@ -44,25 +44,29 @@
<li class="link" data-aos=""><a href="feedback.html">Rate Us?</a></li>
<li class="link" data-aos=""><a href="index.html#cnt-form">Contact Us</a></li>
</ul>

<a href="newLogin.html" class="contact-btn" id="nav-login-btn"><button class="btn login" id="btn-style"
data-aos="fade-down">Login/SignUp</button></a>
<a href="mapa.html" class="contact-btn" id="nav-view-btn"><button class="btn" id="btn-style" style="margin: 0;"
data-aos="fade-down">view <map name=""></map></button></a>

<a href="loginPage.html" class="contact-btn"><button class="btn" id="logout-btn"
style="margin: 0; display: none;" data-aos="fade-down" disabled>Log Out</button></a>

<div class="contact-btns" style="display: flex; gap: 10px; align-items: center;">
<a href="newLogin.html" class="contact-btn" id="nav-login-btn">
<button class="btn login" id="btn-style" data-aos="fade-down">Login/<br>SignUp</button>
</a>
<a href="mapa.html" class="contact-btn" id="nav-view-btn">
<button class="btn" id="btn-style" style="margin: 0;" data-aos="fade-down">View <map name=""></map></button>
</a>
<a href="loginPage.html" class="contact-btn">
<button class="btn" id="logout-btn" style="margin: 0; display: none;" data-aos="fade-down" disabled>Log
Out</button>
</a>
</div>
<!-- <a href="login-modified.html" class="contact-btn"><button class="btn" id="btn-style"
style="margin: 0; box-shadow:1.5px 1.5px 6px red;" 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 class="hamburger" id="hamburger" data-aos="fade-down">
<div class="line" style="margin-bottom: 5px;"></div>
<div class="line" style="margin-bottom: 5px;"></div>
<div class="line" style="margin-bottom: 5px;"></div>
<div class="line" style="margin-bottom: 5px;"></div>
</div>
</nav>
</div>
Expand Down
6 changes: 5 additions & 1 deletion dedicated-destinations/Dubai/Dubai.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ body {
/* margin-left: 5rem; */
width: 40%;
}

.sitelogo {
height: 35px;
width: 35px;
margin-right: 10px;
}

.menu {

Expand Down
Binary file added dedicated-destinations/Dubai/gallery/favicon.ico
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions dedicated-destinations/Dubai/start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
<body>
<div class="nav-container">
<nav class="newNav">
<a href="#" class="nav__logo" data-aos="fade-right"
style="text-decoration: none;">Tourguide<span>.</span></a>

<div style="display: flex; align-items: center;">
<img src="./gallery/favicon.ico" class="sitelogo">
<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>
</div>
<ul class="navLinks">
<li class="link home" data-aos="fade-down"><a href="../../index.html">Home</a></li>
<li class="link" data-aos="fade-down"><a href="../../index.html#Destinations">Destinations</a></li>
Expand Down
Binary file added dedicated-destinations/Goa/favicon.ico
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions dedicated-destinations/London/London.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,4 +924,10 @@ body.dark-theme #Drinks, body.dark-theme #Eat {
background-color: #0d213f;
border-color: #888888;
color: rgb(151, 6, 241);
}

.sitelogo {
height: 35px;
width: 35px;
margin-right: 10px;
}
Binary file added dedicated-destinations/London/gallery/favicon.ico
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions dedicated-destinations/London/start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
<body>
<div class="nav-container">
<nav class="newNav">
<a href="#" class="nav__logo" data-aos="fade-right"
style="text-decoration: none;">Tourguide<span>.</span></a>

<div style="display: flex; align-items: center;">
<img src="./gallery/favicon.ico" class="sitelogo">
<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>
</div>
<ul class="navLinks">
<li class="link home" data-aos="fade-down"><a href="../../index.html">Home</a></li>
<li class="link" data-aos="fade-down"><a href="../../index.html#Destinations">Destinations</a></li>
Expand Down
Binary file added dedicated-destinations/Maldives/gallery/favicon.ico
View file
Open in desktop
Binary file not shown.
6 changes: 5 additions & 1 deletion dedicated-destinations/Maldives/maldive.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ body {
/* margin-left: 5rem; */
width: 40%;
}

.sitelogo {
height: 35px;
width: 35px;
margin-right: 10px;
}

.menu {

Expand Down
7 changes: 4 additions & 3 deletions dedicated-destinations/Maldives/start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
<body>
<div class="nav-container">
<nav class="newNav">
<a href="#" class="nav__logo" data-aos="fade-right"
style="text-decoration: none;">Tourguide<span>.</span></a>

<div style="display: flex; align-items: center;">
<img src="./gallery/favicon.ico" class="sitelogo">
<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>
</div>
<ul class="navLinks">
<li class="link home" data-aos="fade-down"><a href="../../index.html">Home</a></li>
<li class="link" data-aos="fade-down"><a href="../../index.html#Destinations">Destinations</a></li>
Expand Down
6 changes: 5 additions & 1 deletion dedicated-destinations/Paris/Paris.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ body {
width: 40%;
}


.sitelogo {
height: 35px;
width: 35px;
margin-right: 10px;
}
.menu {

background-color: rgb(251, 248, 242);
Expand Down
Binary file added dedicated-destinations/Paris/gallery/favicon.ico
View file
Open in desktop
Binary file not shown.
105 changes: 60 additions & 45 deletions dedicated-destinations/Paris/start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
<body>
<div class="nav-container">
<nav class="newNav">
<a href="#" class="nav__logo" data-aos="fade-right"
style="text-decoration: none;">Tourguide<span>.</span></a>

<div style="display: flex; align-items: center;">
<img src="./gallery/favicon.ico" class="sitelogo">
<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>
</div>
<ul class="navLinks">
<li class="link home" data-aos="fade-down"><a href="../../index.html">Home</a></li>
<li class="link" data-aos="fade-down"><a href="../../index.html#Destinations">Destinations</a></li>
Expand Down Expand Up @@ -58,24 +59,23 @@
<div class="relative_image">
<div class="slider-container">
<!-- change -->
<img id="slider-image" class="slider-image" src="./gallery/Paris1.jpg"
alt="Slider Image">
<img id="slider-image" class="slider-image" src="./gallery/Paris1.jpg" alt="Slider Image">
<div class="thumb">
<button class="arrow left" onclick="moveSlide(-1)">&#8249;</button>
<div class="thumbnails" id="thumbnails-container">

</div>
<button class="arrow right" onclick="moveSlide(1)">&#8250;</button>
</div>
</div>

</div>
</div>


<div class="HeadingText">
<p id="p-text"></p>
<div>
<a href="../../payment.html"><button class="bttn btn-style" id="btnss">Check-Out</button></a>
<a href="../../payment.html"><button class="bttn btn-style" id="btnss">Check-Out</button></a>
</div>
</div>
</div>
Expand All @@ -102,57 +102,59 @@ <h3><i class="fa-solid fa-bus"></i> Free pickup & drop-off</h3>
<h3><i class="fa fa-undo"></i> Free cancellation</h3>
<p>Up to 100% refund according to the cancellation policy.</p>
</div>

<div class="Info-container">

<div class="check-in-out">
<h3>Book Your Stay</h3>

<div class="check-in">
<label for="check-in">Check In:</label>
<input type="datetime-local" id="check-in">
</div>

<div class="check-out">
<label for="check-out">Check Out:</label>
<input type="datetime-local" id="check-out">
</div>

<div class="btn-container">
<button class="btn">Submit</button>
<button class="btn">Cancel</button>
</div>
</div>

<div id="weatherInfo">
<h3>Climate Info </h3>
<div>Max Temp: <span class="max"></span>°C <span><i style="font-size:1.5rem;color: red;" class="fa">&#xf2c7;</i></span></div>
<div>Min Temp: <span class="min"></span>°C <span><i style="font-size:1.5rem;color: blue;" class="fa">&#xf76b;</i></span></div>
<div>Max Temp: <span class="max"></span>°C <span><i style="font-size:1.5rem;color: red;"
class="fa">&#xf2c7;</i></span></div>
<div>Min Temp: <span class="min"></span>°C <span><i style="font-size:1.5rem;color: blue;"
class="fa">&#xf76b;</i></span></div>
<div>Humidity: <span class="humidity"></span>% </div>
<!-- Weather information will be inserted here -->
</div>

</div>

<br>
<div class="transport-container">
<div class="single-list-topics-content">
<div class="icon1"><i style="font-size:2rem" class="fa">&#xf072;</i></div>
<button class="btn-style">Flight</button>
</div>

<div class="single-list-topics-content">
<div class="icon2"><i style="font-size:2rem" class="fa">&#xf238;</i></div>
<button class="btn-style">Train</button>
</div>
<div class="single-list-topics-content">
<div class="icon3"><i style="font-size:2rem" class="fa">&#xf207;</i></div>
<button class="btn-style">Bus</button>
<div> </div>
</div>

<div class="single-list-topics-content">
<div class="icon1"><i style="font-size:2rem" class="fa">&#xf072;</i></div>
<button class="btn-style">Flight</button>
</div>

<div class="single-list-topics-content">
<div class="icon2"><i style="font-size:2rem" class="fa">&#xf238;</i></div>
<button class="btn-style">Train</button>
</div>
<div class="single-list-topics-content">
<div class="icon3"><i style="font-size:2rem" class="fa">&#xf207;</i></div>
<button class="btn-style">Bus</button>
<div> </div>
</div>



</div>
</div>

Expand All @@ -173,11 +175,22 @@ <h3>Climate Info </h3>

<div id="Eat" class="w3-container menu w3-padding-48 w3-card">
<!-- change -->
<p id="description-text">Paris is not just the capital of France; it’s the capital of fashion and the city of love. Located by the River Seine in the north of France, Paris is reputed for being the most beautiful and romantic city in the world. <br><br> It is overwhelmed with culture, history, iconic architecture, arty treasures, delicious food and exciting fashion. Europe’s most enchanting city, Paris is known for its many monuments, especially the Eiffel Tower, Notre-Dame
<p id="description-text">Paris is not just the capital of France; it’s the capital of
fashion and the city of love. Located by the River Seine in the north of France,
Paris is reputed for being the most beautiful and romantic city in the world.
<br><br> It is overwhelmed with culture, history, iconic architecture, arty
treasures, delicious food and exciting fashion. Europe’s most enchanting city, Paris
is known for its many monuments, especially the Eiffel Tower, Notre-Dame
Cathedral, Arc de Triomphe, Opéra Garnier, Les Invalides, etc.
<br><br>Paris was home to some of the best artists through history; hence, it harbors treasures and antiques from the masters like Picasso, Van Gogh, Monet, Dalí, and Renoir. Paris (and the whole of France) is famous for its
food and drinks; from cozy little cafes to one of its many Michelin-starred restaurants – the food is prepared and presented with perfection here.<br><br> Whether you’re a first-timer or regular visitor, Paris always seems
magical as there are so many places to explore. It’s no wonder that the city is one of the most popular tourist destinations in the world and welcomes over 45 million visitors every year.
<br><br>Paris was home to some of the best artists through history; hence, it
harbors treasures and antiques from the masters like Picasso, Van Gogh, Monet, Dalí,
and Renoir. Paris (and the whole of France) is famous for its
food and drinks; from cozy little cafes to one of its many Michelin-starred
restaurants – the food is prepared and presented with perfection here.<br><br>
Whether you’re a first-timer or regular visitor, Paris always seems
magical as there are so many places to explore. It’s no wonder that the city is one
of the most popular tourist destinations in the world and welcomes over 45 million
visitors every year.
</p>
</div>

Expand All @@ -195,22 +208,24 @@ <h3>Offers</h3>
<p>Find the best offer and discount on tourguide.</p>

</div>

</div>
</div>

<!-- change -->
<div class="map">
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d83998.96777879319!2d2.264634775972664!3d48.85882549227066!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x47e66e1f06e2b70f%3A0x40b82c3688c9460!2sParis%2C%20France!5e0!3m2!1sen!2sin!4v1706388784229!5m2!1sen!2sin"
width="100%" height="100%" style="border:0;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe>
</div>
<iframe
src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d83998.96777879319!2d2.264634775972664!3d48.85882549227066!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x47e66e1f06e2b70f%3A0x40b82c3688c9460!2sParis%2C%20France!5e0!3m2!1sen!2sin!4v1706388784229!5m2!1sen!2sin"
width="100%" height="100%" style="border:0;" allowfullscreen="" loading="lazy"
referrerpolicy="no-referrer-when-downgrade"></iframe>
</div>
</div>



</div>
</div>
</div>
</div>
</section>


Expand Down
Binary file added dedicated-destinations/bali/gallery/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file added dedicated-destinations/brazil/gallery/favicon.ico
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions dedicated-destinations/grand-canyon-national-park-arizona/Grand_start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
<body>
<div class="nav-container">
<nav class="newNav">
<a href="#" class="nav__logo" data-aos="fade-right"
style="text-decoration: none;">Tourguide<span>.</span></a>

<div style="display: flex; align-items: center;">
<img src="./gallery_Grand/favicon.ico" class="sitelogo">
<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>
</div>
<ul class="navLinks">
<li class="link home" data-aos="fade-down"><a href="../../index.html">Home</a></li>
<li class="link" data-aos="fade-down"><a href="../../index.html#Destinations">Destinations</a></li>
Expand Down
6 changes: 5 additions & 1 deletion dedicated-destinations/grand-canyon-national-park-arizona/Grand_tour.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ body {
/* margin-left: 5rem; */
width: 40%;
}

.sitelogo {
height: 35px;
width: 35px;
margin-right: 10px;
}

.menu {

Expand Down
Binary file added dedicated-destinations/grand-canyon-national-park-arizona/gallery_Grand/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file added dedicated-destinations/kashmir/favicon.ico
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions dedicated-destinations/machu-picchu-peru/Machu_start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
<body>
<div class="nav-container">
<nav class="newNav">
<a href="#" class="nav__logo" data-aos="fade-right"
style="text-decoration: none;">Tourguide<span>.</span></a>

<div style="display: flex; align-items: center;">
<img src="./gallery_Machu/favicon.ico" class="sitelogo">
<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>
</div>
<ul class="navLinks">
<li class="link home" data-aos="fade-down"><a href="../../index.html">Home</a></li>
<li class="link" data-aos="fade-down"><a href="../../index.html#Destinations">Destinations</a></li>
Expand Down
Loading
Loading