Skip to content

Commit

Permalink
resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@multiverseweb
multiverseweb committed Oct 19, 2024
1 parent 7ff20ae commit 1cc5d01
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 86 deletions.
34 changes: 17 additions & 17 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
<link href="https://fonts.googleapis.com/css2?family=Inconsolata:[email protected]&display=swap" rel="stylesheet">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<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=Montserrat+Alternates:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link
href="https://fonts.googleapis.com/css2?family=Montserrat+Alternates:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"
rel="stylesheet">
<link rel="stylesheet" href="css/styles.css">
</head>

Expand All @@ -39,8 +41,7 @@
</svg>
</div>

<!-- dribbble -->
<a class="dribbble" href="https://dribbble.com/shots/5878367-Loaders" target="_blank"><img src="https://cdn.dribbble.com/assets/dribbble-ball-mark-2bd45f09c2fb58dbbfb44766d5d1d07c5a12972d602ef8b32204d28fa3dda554.svg" alt=""></a>

</div>
<div class="buttons" id="buttons">
<div id="indicator"></div>
Expand All @@ -50,14 +51,14 @@
</button>
<button id="lightButton" onclick="light(false)">
<!-- <div id="theme2"> -->
<img src="https://cdn-icons-png.freepik.com/256/467/467619.png?semt=ais_hybrid" alt="" class="copy"
id="sun">
<img src="https://cdn-icons-png.freepik.com/256/467/467619.png?semt=ais_hybrid" alt="" class="copy"
id="sun">
<!-- </div> -->
</button>
</div>
<button id="defaultButton" onclick="systemDefault()">
<img src="website/web_images/settings.png" class="copy" id="default">
</button>
</div>
</div>
<button class="top" id="top" onclick="topFunction()"><img src="website/web_images/top.png" alt=""></button>
<nav id="navbar">
Expand All @@ -79,7 +80,7 @@
"><a href="login.html">Login/Signup</a>
</button>
</nav>

<button class="burger" id="burger" onclick="show()"></button>
<button id="cross" class="burger" onclick="hide()"></button>
<div class="burger" id="lines">
Expand Down Expand Up @@ -285,35 +286,34 @@
</form>
</footer>
<div class="links">
<p>
<p>
<h3> Designed & Developed by Tejas Gupta</h3>
</p>
<br>
<h4>Copyright &copy; <span id="copyright">32949832</span> Tejas Gupta</h4>
<h4>Copyright &copy; <span id="copyright">32949832</span> Tejas Gupta</h4>
<div class="end_line"></div>
<div class="small">
<div class="link_class">
<a href="https://github.com/multiverseweb/Dataverse/blob/main/README.md"
class="table_link">Documentation↗</a>

<a href="./website/contributor.html" class="table_link">Contributors↗</a>
<a href="website/codeOfconduct.html" class="table_link" target="_blank">Code of Conduct↗</a>
<a href="website/license.html" class="table_link">License↗</a>
</div>
<div class="link_class">
<a href="https://www.figma.com/proto/BBbXARgpxercxacjm0qpgX/Dataverse?type=design&node-id=45-25&t=zMFBUgENaIeqhRYZ-1&scaling=scale-down-width&page-id=0%3A1&starting-point-node-id=22%3A310&show-proto-sidebar=1&mode=design"
<a href="https://www.figma.com/proto/BBbXARgpxercxacjm0qpgX/Dataverse?type=design&node-id=45-25&t=zMFBUgENaIeqhRYZ-1&scaling=scale-down-width&page-id=0%3A1&starting-point-node-id=22%3A310&show-proto-sidebar=1&mode=design"
class="table_link">Figma Design↗</a>
<a href="https://tejasgupta.netlify.app"><i class="fa fa-user"></i> Portfolio↗</a>
<a href="https://github.com/multiverseweb"><i class="fa fa-github"></i> Github Profile↗</a>
<a href="https://www.linkedin.com/in/tejascodes/"><i class="fa fa-linkedin-square"></i> Linkeldn ↗</a>
<a href="https://tejasgupta.netlify.app">Portfolio↗</a>
<a href="https://github.com/multiverseweb">Github Profile↗</a>
<a href="https://www.linkedin.com/in/tejascodes/"> Linkeldn ↗</a>
</div>

</div>
<div class="end_line"></div>
<script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
<script src="website/script.js"></script>


</body>

</html>
</html>
26 changes: 25 additions & 1 deletion website/script.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ var shadow = document.getElementById("shadow");
var download = document.getElementById("download_btn");
const lightButton = document.getElementById("lightButton");
const darkButton = document.getElementById("darkButton");
const technologies = document.getElementById("technologies");


let lastScrollTop = 0;
Expand All @@ -117,6 +118,15 @@ window.addEventListener('scroll', () => {
lastScrollTop = scrollTop;
});

let lastScroll = 0;
function progress() {
var scroll = this.scrollY;
var percent = Math.round((scroll / 3500) * 100);
document.getElementById("progress_bar").style.width = percent + 'vw';
};

window.addEventListener("scroll", progress);


function show() {
l2.style.opacity = 0;
Expand Down Expand Up @@ -176,15 +186,29 @@ function light(flag) {
localStorage.setItem('theme', 'light');
body.classList.remove('dark-mode');
body.classList.add('light-mode');

document.getElementById("map").style.filter = "none";
document.getElementById("map").style.zIndex = 0;
tags.style.borderColor = "black";
tags.style.backgroundColor = "#171717";
indicator.style.backgroundImage = "radial-gradient(rgba(0,0,0, 0.608),#00000000,#00000000)";
shadow.style.backgroundImage = "linear-gradient(115deg, #00000000,#f9f9f9,#00000000)";
contribute.style.filter="invert(1)";
technologies.style.border="1px solid #00000044";
const lightButton = document.getElementById("lightButton");
updateIndicator(lightButton); // Update the indicator position and style for the light button
}

function dark(flag) {
localStorage.setItem('theme', 'dark');
document.getElementById("map").style.filter = "invert(1) hue-rotate(180deg) brightness(1.5)";
tags.style.borderColor = "rgba(255, 255, 255, 0.323)";
tags.style.backgroundColor = "#00000000";
indicator.style.backgroundImage = "radial-gradient(rgba(255,255,255, 0.608),#00000000,#00000000)";
shadow.style.backgroundImage = "linear-gradient(115deg, #00000000,#000000d4,#00000000)";
body.classList.remove('light-mode');
body.classList.add('dark-mode');
contribute.style.filter="invert(0)";
technologies.style.border="1px solid #ffffff044";

const darkButton = document.getElementById("darkButton");
updateIndicator(darkButton); // Update the indicator position and style for the dark button
Expand Down
91 changes: 23 additions & 68 deletions website/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ a {
justify-content: center;
position: fixed;
width: 40px;
padding: 8px 0px;
padding: 10px 0px;
background-color: #3b3b3b57;
backdrop-filter: blur(2px);
border-radius: 40px;
Expand All @@ -228,43 +228,23 @@ a {
box-shadow: 0px 0px 10px black, 0px 0px 10px black;
}

/* #indicator
{
top: 50px;
height: 60px;
width: 60px;
border-radius: 10%;
background-image: radial-gradient(rgba(255, 255, 255, 0.608), #00000000, #00000000);
position: absolute;
transition-duration: 0.3s;
} */

#indicator {
height: 40px; /* Set the height of the indicator slightly larger than buttons */
width: 40px; /* Set the width to match */
border-radius: 40%; /* Ensure circular shape */
height: 35px; /* Set the height of the indicator slightly larger than buttons */
width: 35px; /* Set the width to match */
border-radius: 50%; /* Ensure circular shape */
position: absolute;
transition-duration: 0.3s;
background-image: radial-gradient(circle, rgba(255, 255, 255, 0.6), rgba(0, 0, 0, 0)); /* Glow effect */
background-image: radial-gradient(circle, rgba(255, 255, 255, 0.501), rgba(0, 0, 0, 0), rgba(0, 0, 0, 0), rgba(0, 0, 0, 0)); /* Glow effect */
}



.group {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 7px;
border-radius: 40px;
border: 1px solid rgba(255, 255, 255, 0.236);
}

/* .buttons button {
margin-top: 20px;
background-color: #00000000;
border: none;
} */

.buttons button {
margin-top: 20px;
Expand All @@ -278,24 +258,13 @@ a {
}




#darkButton {
margin-top: 0;
}


/* #moon {
filter: invert(1);
} */

/* #sun {
filter: invert(1);
} */

#defaultButton {
filter: invert(1);
margin-top: 20px;
margin-top: 12px;
}
/* Apply inversion only to specific elements */
/* General styles for light mode */
Expand All @@ -320,7 +289,6 @@ footer {
background-color: white; /* Light mode footer background */
color: black; /* Light mode footer text color */
padding: 20px; /* Padding for the footer */
border-top: 1px solid #ccc; /* Optional: border for separation */
}

/* Dark mode footer styling */
Expand Down Expand Up @@ -351,12 +319,6 @@ body.light-mode footer h3{
margin-top: 20px;
}

/* Specific styles for the footer to ensure text remains dark */
footer {
color: black; /* Set footer text color to black */
background-color: white; /* Set footer background to white */
/* Other footer styles can go here */
}

.glow {
box-shadow: 0 0 10px 5px rgba(255, 255, 0, 0.7); /* Customize glow style */
Expand Down Expand Up @@ -801,7 +763,7 @@ tr:hover {
#technologies {
display: flex;
flex-direction: row;
width: calc(35vw - 10px);
width: calc(35vw - 0px);
border-radius: 10px 10px 0px 0px;
margin-bottom: 0px;
padding: 5px;
Expand Down Expand Up @@ -924,7 +886,7 @@ footer {
flex-direction: row;
padding-left: 10vw;
padding-right: 10vw;
background-color: rgba(0, 0, 0, 0.8); /* Semi-transparent black for dark mode */
background-color: rgb(0, 0, 0); /* Semi-transparent black for dark mode */
color: silver; /* Silver text for good contrast */
transition: background-color 0.3s, color 0.3s; /* Smooth transition effect */
justify-content: space-between; /* Ensures even spacing between elements */
Expand All @@ -948,12 +910,14 @@ footer input[type="text"],
footer input[type="email"],
footer input[name="Message"],
footer input[type="submit"] {
backdrop-filter: blur(50px);
box-shadow: 0 0 10px black;
margin: 10px 0; /* Margin between inputs */
padding: 10px; /* Padding for better usability */
border-radius: 5px; /* Rounded corners */
border: 1px solid silver; /* Silver border */
border: 1px solid rgba(126, 126, 126, 0.382); /* Silver border */
background-color: rgba(255, 255, 255, 0.1); /* Light background for inputs in dark mode */
color: silver; /* Silver text for inputs */
color: rgb(255, 255, 255); /* Silver text for inputs */
transition: background-color 0.3s, color 0.3s; /* Smooth transition for inputs */
}

Expand All @@ -977,7 +941,7 @@ footer input[type="submit"]:hover {
/* Form styling */
form {
background-color: #4c4c4c2a;
backdrop-filter: blur(5px);
backdrop-filter: blur(10px);
width: 30vw;
margin-left: 5vw;
padding: 20px;
Expand All @@ -987,15 +951,10 @@ form {
transition: transform 0.3s ease-in-out;
}

/* Form hover effect */
form:hover {
transform: scale(1.05); /* Scale up on hover */
}

/* Input field styling */
input {
background-color: #76767639;
border: 0.1px solid rgba(255, 255, 255, 0.193);
width: 85%;
height: 30px;
margin-top: 20px;
Expand All @@ -1004,20 +963,14 @@ input {
transition: transform 0.3s ease-in-out, border 0.3s ease-in-out;
}

/* Input hover effect */
input:hover {
transform: scale(1.02); /* Slightly enlarge on hover */
border: 0.1px solid rgba(255, 255, 255, 0.5); /* Add border effect */
}

/* Send button styling */
#send {
display: block;
margin: 20px auto; /* Center the button horizontally */
width: min-content;
background-color: rgba(0, 123, 121, 0.364);
cursor: pointer;
color: rgba(255, 255, 255, 0.63);
color: rgba(255, 255, 255, 0.873);
padding: 8px 15px;
border-radius: 5px;
transition: background-color 0.3s ease, color 0.3s ease, box-shadow 0.3s ease;
Expand All @@ -1034,7 +987,7 @@ input:hover {
height: 60vh;
position: absolute;
right: -120px;
margin-top: -180px;
margin-top: 50px;
}

.contact {
Expand Down Expand Up @@ -1063,9 +1016,9 @@ input:hover {

.links {
font-weight: 100;
background-color: #121212;
background-color: #000000;
height: auto;
margin-top: 50px;
margin-top: -5px;
text-align: center;
padding-top: 20px;
}
Expand All @@ -1092,12 +1045,13 @@ input:hover {
}

.small {
margin-top: 20px;
display: flex;
font-size: medium;
justify-content: space-around;
}

.small a {
.link_class a {
margin-top: 20px;
z-index: 10;
border-bottom: 0px solid rgba(255, 255, 255, 0);
Expand Down Expand Up @@ -1132,7 +1086,8 @@ input:hover {
}

#download {
padding-top: 70px;
margin-top: -30px;
padding-top: 0px;
height: fit-content;
flex-direction: column-reverse;
}
Expand Down Expand Up @@ -1238,7 +1193,7 @@ input:hover {
width: 70vw;
height: 70vw;
left: -60px;
z-index: -10;
z-index: 0;
margin-top: 70px;
}

Expand All @@ -1264,7 +1219,7 @@ input:hover {

#technologies {
font-size: large;
width: calc(75vw - 10px);
width: calc(75vw - 0px);
}

.text {
Expand Down

0 comments on commit 1cc5d01

Please sign in to comment.