Skip to content

Commit

Permalink
conflicts resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
@hars-21
hars-21 committed Aug 10, 2024
1 parent 39facd9 commit 1ec2533
Show file tree
Hide file tree
Showing 6 changed files with 279 additions and 286 deletions.
6 changes: 3 additions & 3 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="./styles/mainstyle.css" />
<link rel="stylesheet" href="./styles/default.style.css" />
<link rel="stylesheet" href="/styles/global.css" />
<link rel="stylesheet" href="./styles/global.css" />
<link rel="stylesheet" href="./styles/index.style.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css" />
<!-- JavaScript files -->
Expand All @@ -20,15 +20,15 @@
</head>

<body>
<script src="/js/global.js"></script>
<script src="./js/global.js"></script>
<script src="./js/nav.footer.js"></script>

<audio id="background-music" autoplay loop>
<source src="./assets/sounds/bgMusic.mp3" type="audio/mpeg" />
</audio>

<video autoplay muted class="video" loop id="myVideo">
<source src="/assets/videos/1.mp4" type="video/mp4" />
<source src="./assets/videos/1.mp4" type="video/mp4" />
</video>

<div id="nav-placeholder"></div>
Expand Down
6 changes: 2 additions & 4 deletions pages/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link href="https://fonts.googleapis.com/css2?family=Anton&display=swap" rel="stylesheet" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link href="https://fonts.googleapis.com/css2?family=Tiny5&display=swap" rel="stylesheet" />
<link rel="stylesheet" href="../styles/global.css" />
<link rel="stylesheet" href="../styles/mainstyle.css" />
Expand All @@ -21,8 +19,8 @@
</head>

<body>
<script src="/js/global.js"></script>
<script src="/js/scrollToTop.js"></script>
<script src="../js/global.js"></script>
<script src="../js/scrollToTop.js"></script>
<script src="../js/nav.footer.js"></script>


Expand Down
4 changes: 2 additions & 2 deletions pages/contributors.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
</head>

<body>
<script src="/js/global.js"></script>
<script src="/js/scrollToTop.js"></script>
<script src="../js/global.js"></script>
<script src="../js/scrollToTop.js"></script>
<script src="../js/nav.footer.js"></script>


Expand Down
2 changes: 0 additions & 2 deletions pages/howtoplay.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link href="https://fonts.googleapis.com/css2?family=Anton&display=swap" rel="stylesheet" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link href="https://fonts.googleapis.com/css2?family=Tiny5&display=swap" rel="stylesheet" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" />
<link rel="stylesheet" href="../styles/mainstyle.css" />
Expand Down
2 changes: 1 addition & 1 deletion pages/privacypolicy.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ <h2 class="section-title">Contact Us</h2>
</div>
<div id="footer-placeholder"></div>

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


<script>
Expand Down
Loading

0 comments on commit 1ec2533

Please sign in to comment.