Skip to content

Commit

Permalink
Merge branch 'main' into test
Browse files Browse the repository at this point in the history
  • Loading branch information
Ojas-Arora committed Jul 10, 2024
2 parents f2dd925 + 7ca168a commit d35d69f
Show file tree
Hide file tree
Showing 3 changed files with 262 additions and 24 deletions.
60 changes: 50 additions & 10 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,36 @@
font-size: 40px;
}

/* Style the submit and reset buttons */
.button div a {
padding: 10px 20px;
border-radius: 5px;
background-color: #4CAF50;
color: white;
text-align: center;
text-decoration: none;
display: inline-block;
transition: background-color 0.3s;
}

.button div a:hover {
background-color: #45a049;
}

/* Style for the randomize button */
#randomize a {
background-color: #ff9800;
color: white;
padding: 10px 20px;
border-radius: 5px;
transition: background-color 0.3s;
}

#randomize a:hover {
background-color: #e68900;
}


body {
margin: 0;
padding: 0;
Expand Down Expand Up @@ -2518,18 +2548,28 @@ button:active {
text-align: center;
}

.footer-links {
margin-left: 20px; /* Margin from the left */
.footer-left,
.footer-right {
display: flex;
align-items: center; /* Ensure items inside are centered vertically */
}

.footer-links a {
text-decoration: none;
color: white;
font-weight: normal;
font-size:1.2em;
cursor: pointer;
.footer-left {
justify-content: flex-start;
padding-left: 20px;
}

.footer-right {
justify-content: flex-end;
padding-right: 20px;
}

.footer-link {
color: white;
text-decoration: none;
font-size: 17px;
}

.footer-links a:hover {
color: #007BFF; /* Light blue color on hover to indicate interactivity */
.footer-link:hover {
color: lightblue;
}
47 changes: 33 additions & 14 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,29 @@
<li class="cross"><i style="cursor: pointer;" class="fa-solid fa-x"></i></li>
<li class="logo"><a href="./index.html"><img src="assets/images/logo/logo..png" alt="Website Logo"></a></li>
<li><a href="#" id="reload" style="display: none;" aria-label="reload">Reload</a></li>
<li><a href="#" id="addTime" aria-label="Add Time" style="display: none;">Add Time</a></li>
<!-- <li><a href="#" id="addTime" aria-label="Add Time" style="display: none;">Add Time</a></li> -->
<li><a href="#" id="pauseStartBtn" style="display: none;" aria-label="Pause/Start">Pause</a></li>
<li><a href="#" id="fullscreenBtn" aria-label="Toggle Fullscreen">Fullscreen</a></li>
<li><a href="#" id="editBtn" aria-label="Edit">Edit</a></li>
<!-- edit drop down content -->
<div class="editdropdown" id="editdropdown" style="display: none;">
<li class="exclude"><a href="#" id="addTime" aria-label="Add Time" >Add Time</a></li> <!--exclude is used in script.js in sidenbar animation to remove the animation time function-->
<li class="exclude" id="changeMusic">
<select id="musicDropdown" aria-label="Change Music">
<option value="select" disabled selected style="font-family: 'Playfair Display', serif;">Change Music</option>
<option value="none">None</option>
<option value="disco">Disco</option>
<option value="fairies">Fairies</option>
<option value="funky">Funky</option>
<option value="upbeatdisco">Upbeatdisco</option>
<option value="vintage">Vintage</option>
<option value="whistle">Whistle</option>
<option value="snare">Snare</option>
</select>
</li>
</div>
<!-- Add this inside your existing HTML structure, preferably at the end of <body> -->
<div id="editPopup" class="edit-popup">
<!-- <div id="editPopup" class="edit-popup">
<div class="edit-popup-content">
<h2>Edit Options</h2>
<ul>
Expand All @@ -56,18 +73,18 @@ <h2>Edit Options</h2>
<option value="disco">Disco</option>
<option value="fairies">Fairies</option>
<option value="funky">Funky</option>
<option value="upbeatdisco">upbeatdisco</option>
<option value="upbeatdisco">Upbeatdisco</option>
<option value="vintage">Vintage</option>
<option value="whistle">Whistle</option>
<option value="snare">Snare</option>
</select>
</a>
</li>
<!-- Add more options as needed -->
Add more options as needed
</ul>
<button id="closeEditPopup">Close</button>
</div>
</div>
</div> -->
<li><a href="pages/about.html">About</a></li>
<li><a href="pages/features.html">Features</a></li>
<li><a href="./Login/index1.html">Step In</a></li>
Expand Down Expand Up @@ -95,14 +112,14 @@ <h2>Edit Options</h2>
<div class="box" id="box">


<h1 id="changingHeading" style="font-family: Arial, sans-serif; font-size: 30px; color: #ffffff;">
<h1 id="changingHeading">Random Disco <span id="changing">Light Simulator</span></h1>

Random Disco
<!-- Random Disco
<span id="changing"
style="font-family: Arial, sans-serif; font-size: 30px; font-weight: bold; color: #ff7f50;">
Light Simulator
</span>
</h1>
</h1> -->
<div class="form">

<div>
Expand Down Expand Up @@ -220,8 +237,11 @@ <h1 id="changingHeading" style="font-family: Arial, sans-serif; font-size: 30px;
</div>

<footer class="footer" style="width: 100%;height: 2px; ">
<div class="footer-links">
<p><a href="./pages/privacy.html">Privacy Policy</a></p>
<div class="footer-left">
<a href="./pages/privacy.html" class="footer-link">Privacy Policy</a>
</div>
<div class="footer-right">
<a href="./pages/terms.html" class="footer-link">Terms and Conditions</a>
</div>

<div class="socialIcons">
Expand Down Expand Up @@ -249,11 +269,10 @@ <h1 id="changingHeading" style="font-family: Arial, sans-serif; font-size: 30px;


<div class="copyright">
<p class="copyright" style="text-align: center">
&copy;
<script>document.write(new Date().getFullYear())</script> Random-Disco-Light-Simulator. All rights reserved.
</p>
<p class="copyright">&copy; <script>document.write(new Date().getFullYear())</script> Random-Disco-Light-Simulator. All rights reserved.</p>
</div>


</footer>

<div id="timerDisplay" aria-label="Timer Display" style="display: none"></div>
Expand Down
179 changes: 179 additions & 0 deletions pages/terms.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Terms - Random Disco Light Simulator</title>
<link rel="icon" href="../assets/images/favicon/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" href="../css/style.css">
<link rel="stylesheet" href="../css/about.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css"
integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA=="
crossorigin="anonymous" referrerpolicy="no-referrer" />
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
</head>
<body>
<div>
<button id="backToTopBtn" title="Back to Top" aria-label="Back to Top"><i class="fas fa-arrow-up"></i></button>
</div>
<div class="snowflakes" style="display: block;">
<div id="particles-js"></div>
</div>
<div class="navHeader">
<div class="header-content">
<nav>
<button id="muteBtn" class="mute-btn" style="display: none;">
<i id="muteIcon" class="fas fa-volume-up"></i>
</button>
<ul class="sidebarOne">
<li class="cross"><i style="cursor: pointer;" class="fa-solid fa-x"></i></li>
<li class="logo"><a href="../index.html"><img src="../assets/images/logo/logo..png" alt="Website Logo"></a></li>
<li><a href="#" id="reload" style="display: none;" aria-label="reload">Reload</a></li>
<li><a href="#" id="addTime" aria-label="Add Time" style="display: none;">Add Time</a></li>
<li><a href="#" id="pauseStartBtn" style="display: none;" aria-label="Pause/Start">Pause</a></li>
<li><a href="#" id="fullscreenBtn" aria-label="Toggle Fullscreen">Fullscreen</a></li>
<li><a href="./about.html">About</a></li>
<li><a href="./features.html">Features</a></li>
<li><a href="#" id="CommentBtn" aria-label="Toggle Comment Form">Feedback</a></li>
<li>
<a href="#">
<select id="musicDropdown" style="display: none;">
<option value="select" disabled selected>Change Music</option>
<option value="none">None</option>
<option value="disco">Disco</option>
<option value="fairies">Fairies</option>
<option value="funky">Funky</option>
<option value="upbeatdisco">upbeatdisco</option>
<option value="vintage">Vintage</option>
<option value="whistle">Whistle</option>
<option value="snare">Snare</option>
</select>
</a>
</li>
</ul>
<ul class="navMain">
<li id="sidebarLines" onclick="toggleSidebar()"><i title="Menu" class="fa-solid fa-bars"></i></li>
</ul>
</nav>
</div>
</div>
<div class="box" id="box">
<a href="/index.html" class="backbtn"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
<h1 id="changingHeading" style="font-family: Arial, sans-serif; font-size: 30px; color: #ffffff; display: block;">
Terms and Conditions
</h1>
<div class="termsBox">
<div class="heading">Terms and Conditions</div>
<div class="desc">
These terms and conditions outline the rules and regulations for the use of our website.
</div>
</div>
<div class="termsBox">
<div class="heading">Intellectual Property Rights</div>
<div class="desc">
Unless otherwise stated, we own the intellectual property rights for all material on this website. All intellectual property rights are reserved. You may access this from our website for your own personal use subjected to restrictions set in these terms and conditions.
</div>
</div>
<div class="termsBox">
<div class="heading">Restrictions</div>
<div class="desc">
You are specifically restricted from all of the following:
<ul>
<li>Publishing any website material in any other media</li>
<li>Selling, sublicensing, and/or otherwise commercializing any website material</li>
<li>Publicly performing and/or showing any website material</li>
<li>Using this website in any way that is or may be damaging to this website</li>
<li>Using this website in any way that impacts user access to this website</li>
<li>Using this website contrary to applicable laws and regulations, or in any way may cause harm to the website, or to any person or business entity</li>
<li>Engaging in any data mining, data harvesting, data extracting, or any other similar activity in relation to this website</li>
<li>Using this website to engage in any advertising or marketing</li>
</ul>
</div>
</div>
<div class="termsBox">
<div class="heading">Your Privacy</div>
<div class="desc">
Please read our <a href="privacy.html">Privacy Policy</a>.
</div>
</div>
<div class="termsBox">
<div class="heading">Limitation of Liability</div>
<div class="desc">
In no event shall we, nor any of our officers, directors, and employees, be held liable for anything arising out of or in any way connected with your use of this website whether such liability is under contract. We, including our officers, directors, and employees shall not be held liable for any indirect, consequential, or special liability arising out of or in any way related to your use of this website.
</div>
</div>
<div class="termsBox">
<div class="heading">Indemnification</div>
<div class="desc">
You hereby indemnify to the fullest extent us from and against any and/or all liabilities, costs, demands, causes of action, damages, and expenses arising in any way related to your breach of any of the provisions of these terms.
</div>
</div>
<div class="termsBox">
<div class="heading">Severability</div>
<div class="desc">
If any provision of these terms is found to be invalid under any applicable law, such provisions shall be deleted without affecting the remaining provisions herein.
</div>
</div>
<div class="termsBox">
<div class="heading">Variation of Terms</div>
<div class="desc">
We are permitted to revise these terms at any time as we see fit, and by using this website you are expected to review these terms on a regular basis.
</div>
</div>
<div class="termsBox">
<div class="heading">Assignment</div>
<div class="desc">
We are allowed to assign, transfer, and subcontract our rights and/or obligations under these terms without any notification. However, you are not allowed to assign, transfer, or subcontract any of your rights and/or obligations under these terms.
</div>
</div>
<div class="termsBox">
<div class="heading">Entire Agreement</div>
<div class="desc">
These terms constitute the entire agreement between us and you in relation to your use of this website, and supersede all prior agreements and understandings.
</div>
</div>
</div>
<footer class="footer" style="width: 100%; height: 2px;">
<div class="socialIcons">
<span class="icons">
<a href="" aria-label="Linkedin" title="linkedin"><i class="fab fa-linkedin ico"></i></a>
</span>
<span class="icons">
<a href="" aria-label="Instagram" title="instagram"><i class="fa-brands fa-instagram ico"></i></a>
</span>
<span class="icons">
<a href="https://github.com/sk66641/Random-Disco-Light-Simulator" title="github">
<i class="fab fa-github ico"></i>
</a>
</span>
<span class="icons">
<a href="" aria-label="X" title="Twitter"><i class="fa-brands fa-x-twitter ico"></i></a>
</span>
<span class="icons">
<a href="" aria-label="Discord" title="discord"><i class="fa-brands fa-discord ico"></i></a>
</span>
</div>
<div class="copyright">
<p class="copyright" style="text-align: center">
&copy;
<script>document.write(new Date().getFullYear())</script> Random-Disco-Light-Simulator. All rights
reserved.
</p>
</div>
</footer>
<script src="https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js"></script>
<script src="../js/background.js"></script>
<script src="../js/script.js"></script>
<script src="../js/backToTopBtn.js"></script>
<script src="../js/social.js"></script>
<div id="accountNotAvailableModal" class="account-not-available-modal">
<div class="account-not-available-modal-content">
<span class="close" id="closeAccountNotAvailableModal">&times;</span>
<h2>Account Not Available</h2>
<p>We apologize for the inconvenience, but our social media accounts are currently unavailable. We are working diligently to bring them online as soon as possible.</p>
<p>In the meantime, if you have any questions or need assistance, please feel free to reach out to us through our website's feedback form. We appreciate your understanding and patience during this time.</p>
<p>Thank you for your continued support! </p>
</div>
</div>
</body>
</html>

0 comments on commit d35d69f

Please sign in to comment.