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

Final Changes #65

Merged
merged 7 commits into from
Oct 11, 2023
Merged

Final Changes #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6fcadd9
Fixed navigation bar
Smitkhobragade Oct 10, 2023
d9e6d70
Added Icons in Footer
Smitkhobragade Oct 10, 2023
bdbc4ce
Added Folder Based Routes
Smitkhobragade Oct 10, 2023
55fdc43
Merge branch 'main' of
Smitkhobragade Oct 11, 2023
03dfb33
New Changes
Smitkhobragade Oct 11, 2023
d9b5349
Finl Changes
Smitkhobragade Oct 11, 2023
4768f52
Merge branch 'main' into main
Smitkhobragade Oct 11, 2023
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
22 changes: 11 additions & 11 deletions about.html → About/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="css/style.css" />
<script src="js/script.js"></script>
<link rel="stylesheet" href="../CSS/style.css" />
<script src="../JS/script.js"></script>
<title>About Us</title>
<style>
.card {
Expand Down Expand Up @@ -73,17 +73,17 @@
<body>
<header class="main-header">
<div class="logo">
<a href="index.html">
<img src="images/logo.png" alt="ISRO" />
<a href="../">
<img src="../images/logo.png" alt="ISRO" />
</a>
</div>
<nav class="desktop-main-menu">
<ul>
<li><a href="PSLV.html">Polar Satellite LV</a></li>
<li><a href="GSLV.html">Geo Satellite LV</a></li>
<li><a href="LVM3.html">Geo Satellite M3</a></li>
<li><a href="COMMU.html">Communication Satellites</a></li>
<li><a href="Foreign.html">Foreign Satellites</a></li>
<li><a href="../PSLV">Polar Satellite LV</a></li>
<li><a href="../GSLV">Geo Satellite LV</a></li>
<li><a href="../LVM3">Geo Satellite M3</a></li>
<li><a href="../Communication-Satelites/">Communication Satellites</a></li>
<li><a href="../Foreign/">Foreign Satellites</a></li>
</ul>
</nav>
</header>
Expand All @@ -103,7 +103,7 @@ <h1>ISRO-Web 🧑🏽‍🚀</h1>
<!-- job 1 -->
<div class="stats1">
<div class="card">
<img src="./images/about us.jpg" alt="Image" />
<img src="../images/about us.jpg" alt="Image" />
<div class="card-text">
<h2 class="jobtitle">Welcome 👋</h2>
<p>
Expand Down Expand Up @@ -148,7 +148,7 @@ <h2 class="jobtitle">Welcome 👋</h2>
>LinkedIn</a
>
</li>
<li><a href="privacy.html">Privacy</a></li>
<li><a href="../Privacy/">Privacy</a></li>
<li><a href="#">Suppliers</a></li>
</ul>
</footer>
Expand Down
68 changes: 0 additions & 68 deletions COMMU.html
View file
Open in desktop

This file was deleted.

9 changes: 6 additions & 3 deletions CSS/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,12 @@ section {
min-width: 130px;
padding: 15px 50px;
margin-top: 10px;
border: 2px solid white;
border: 1px solid white;
text-transform: uppercase;
overflow: hidden;
font-size: x-large;
font-weight: 600;
letter-spacing: 4px;
}

.scroll-arrow {
Expand All @@ -193,7 +195,7 @@ section {

.btn::before {
position: absolute;
content: "hey";
content: "Rewatch";
left: 0;
bottom: 0;
background-color: white;
Expand Down Expand Up @@ -225,7 +227,6 @@ section {
right: 0;
width: 350px;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
z-index: 12;
}

Expand All @@ -248,6 +249,8 @@ section {
padding: 0;
margin: 0;
list-style-type: none;
background-color: rgba(0, 0, 0, 0.600);
transition: 0.5s;
}

.nav-item {
Expand Down
36 changes: 19 additions & 17 deletions Careers.html → Careers/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="css/style.css">
<script src="js/script.js"></script>
<link rel="stylesheet" href="../css/style.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA==" crossorigin="anonymous" referrerpolicy="no-referrer" />

<script src="../js/script.js"></script>
<title>LVM3</title>
<style>
.card {
Expand Down Expand Up @@ -75,17 +77,17 @@
<body>
<header class="main-header">
<div class="logo">
<a href="index.html">
<img src="images/logo.png" alt="ISRO">
<a href="../">
<img src="../images/logo.png" alt="ISRO">
</a>
</div>
<nav class="desktop-main-menu">
<ul>
<li><a href="PSLV.html">Polar Satellite LV</a></li>
<li><a href="GSLV.html">Geo Satellite LV</a></li>
<li><a href="LVM3.html">Geo Satellite M3</a></li>
<li><a href="COMMU.html">Communication Satellites</a></li>
<li><a href="Foreign.html">Foreign Satellites</a></li>
<li><a href="../PSLV/">Polar Satellite LV</a></li>
<li><a href="../GSLV/">Geo Satellite LV</a></li>
<li><a href="../LMV3/">Geo Satellite M3</a></li>
<li><a href="../Communication-Satelites/">Communication Satellites</a></li>
<li><a href="../Foreign/">Foreign Satellites</a></li>

</ul>
</nav>
Expand Down Expand Up @@ -190,14 +192,14 @@ <h2 class="jobtitle">Assistants/Upper Division Clerk and Junior Personal Assista


<footer>
<ul>
<li>ISRO &copy; 2023</li>
<li><a href="https://twitter.com/isro" target="_blank">Twitter</a></li>
<li><a href="https://www.youtube.com/@isroofficial5866" target="_blank">YouTube</a></li>
<li><a href="https://www.linkedin.com/company/isro/" target="_blank">LinkedIn</a></li>
<li><a href="privacy.html">Privacy</a></li>
<li><a href="#">Suppliers</a></li>
</ul>
<ul>
<li><b>ISRO &copy; 2023</b></li>
<li><a href="https://twitter.com/isro" target="_blank"><i class="fa-brands fa-twitter"></i> Twitter</a></li>
<li><a href="https://www.youtube.com/@isroofficial5866" target="_blank"><i class="fa-brands fa-youtube"></i> YouTube</a></li>
<li><a href="https://www.linkedin.com/company/isro/" target="_blank"><i class="fa-brands fa-linkedin"></i> LinkedIn</a></li>
<li><a href="../Privacy/"><i class="fa-solid fa-lock"></i> Privacy</a></li>
<li><a href="#"><i class="fa-solid fa-truck-field"></i> Suppliers</a></li>
</ul>
</footer>


Expand Down
70 changes: 70 additions & 0 deletions Communication-Satelites/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="../css/style.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA==" crossorigin="anonymous" referrerpolicy="no-referrer" />

<title>Communication Satellites</title>
</head>

<body>
<header class="main-header">
<div class="logo">
<a href="../">
<img src="../images/logo.png" alt="ISRO">
</a>
</div>
<nav class="desktop-main-menu">
<ul>
<li><a href="../PSLV/">Polar Satellite LV</a></li>
<li><a href="../GSLV/">Geo Satellite LV</a></li>
<li><a href="../LMV3/">Geo Satellite M3</a></li>
<li><a href="./">Communication Satellites</a></li>
<li><a href="../Foreign/">Foreign Satellites</a></li>

</ul>
</nav>
</header>

<section class="section-animate bg-commu">

</section>
<div class="section-inner-center">
<h3>Communication Satellites</h3>
<p>The Indian National Satellite (INSAT) system is one of the largest domestic communication satellite systems in Asia-Pacific region with nine operational communication satellites placed in Geo-stationary orbit. Established in 1983 with commissioning of INSAT-1B, it initiated a major revolution in India’s communications sector and sustained the same later</p>
</div>
<div class="stats">
<div>
<span class="counter" data-target="43">43</span>
<h4>Total Launches</h4>
</div>
<div>
<span class="counter" data-target="14">14</span>
<h4>Total Active Satellites</h4>
</div>
<div>
<span class="counter" data-target="7">7</span>
<h4>Total Unsuccessful launches</h4>
</div>
</div>


<footer>
<ul>
<li><b>ISRO &copy; 2023</b></li>
<li><a href="https://twitter.com/isro" target="_blank"><i class="fa-brands fa-twitter"></i> Twitter</a></li>
<li><a href="https://www.youtube.com/@isroofficial5866" target="_blank"><i class="fa-brands fa-youtube"></i> YouTube</a></li>
<li><a href="https://www.linkedin.com/company/isro/" target="_blank"><i class="fa-brands fa-linkedin"></i> LinkedIn</a></li>
<li><a href="../Privacy/"><i class="fa-solid fa-lock"></i> Privacy</a></li>
<li><a href="#"><i class="fa-solid fa-truck-field"></i> Suppliers</a></li>
</ul>
</footer>


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

</html>
23 changes: 11 additions & 12 deletions Foreign.html → Foreign/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="css/style.css">
<link rel="stylesheet" href="../CSS/style.css">
<title>Communication Satellites</title>
<style>
.custom-link {
Expand All @@ -21,17 +21,17 @@
<body>
<header class="main-header">
<div class="logo">
<a href="index.html">
<img src="images/logo.png" alt="ISRO">
<a href="../">
<img src="../images/logo.png" alt="ISRO">
</a>
</div>
<nav class="desktop-main-menu">
<ul>
<li><a href="PSLV.html">Polar Satellite LV</a></li>
<li><a href="GSLV.html">Geo Satellite LV</a></li>
<li><a href="LVM3.html">Geo Satellite M3</a></li>
<li><a href="COMMU.html">Communication Satellites</a></li>
<li><a href="Foreign.html">Foreign Satellites</a></li>
<li><a href="../PSLV/">Polar Satellite LV</a></li>
<li><a href="../GSLV/">Geo Satellite LV</a></li>
<li><a href="../LMV3/">Geo Satellite M3</a></li>
<li><a href="../Communication-Satelites/">Communication Satellites</a></li>
<li><a href="./">Foreign Satellites</a></li>

</ul>
</nav>
Expand All @@ -58,8 +58,7 @@ <h4>Total Launches</h4>
<h4>Total Countries</h4>
</div>
<div>
<span class="counter" >$</span>
<span class="counter" data-target="101">101 </span><span class="counter" >M</span>
<span style="font-size: 160px;">$</span><span class="counter" data-target="101">101 </span><span style="font-size: 160px;">M</span>
<h4>Total revenue </h4>
<h4>Between 2013 and 2015</h4>
</div>
Expand All @@ -73,11 +72,11 @@ <h4>Between 2013 and 2015</h4>
<li><a href="https://twitter.com/isro" target="_blank">Twitter</a></li>
<li><a href="https://www.youtube.com/@isroofficial5866" target="_blank">YouTube</a></li>
<li><a href="https://www.linkedin.com/company/isro/" target="_blank">LinkedIn</a></li>
<li><a href="privacy.html">Privacy</a></li>
<li><a href="../Privacy/">Privacy</a></li>
<li><a href="#">Suppliers</a></li>
</ul>
</footer>
<script src="js/script.js"></script>
<script src="../JS/script.js"></script>

</body>

Expand Down
Loading