Fixed inner modal closing bugs

This commit is contained in:
James Dinh 2022-12-16 19:20:01 -08:00
parent 20b93e1aef
commit 31b435e24c
3 changed files with 5 additions and 6 deletions

View File

@ -1762,6 +1762,7 @@ section {
border-radius: 0.2rem; border-radius: 0.2rem;
font-size: 18px; font-size: 18px;
border-top: thin solid rgb(68, 68, 68); border-top: thin solid rgb(68, 68, 68);
cursor: pointer;
} }
.event span { .event span {
display: block; display: block;
@ -1771,6 +1772,7 @@ section {
} }
.event.empty { .event.empty {
background-color: unset; background-color: unset;
cursor: unset;
} }
.event.start-800 { .event.start-800 {

View File

@ -622,7 +622,7 @@
<section id="workshops"> <section id="workshops">
<h2 class="topic">Workshops</h2> <h2 class="topic">Workshops</h2>
<hr class="line"> <hr class="line">
<p id="workshops-description">Our workshops will be hosted in-person and on <a class="link tooltip zoom-tooltip-link" href="https://us06web.zoom.us/j/84398429896?pwd=b0ZUZ2pieXFKeUwxTVY0NVE1MTNxdz09" target="_blank">Zoom</a>!</p> <p id="workshops-description">Our workshops will be hosted in-person!</p>
<div class="flex-container"> <div class="flex-container">
<div class="workshop-entry"> <div class="workshop-entry">
<div class="workshop-header" id="webdev-workshop"> <div class="workshop-header" id="webdev-workshop">
@ -860,7 +860,7 @@
<div class="team-picture"><img src="img/Gilroy_Hacks_Logo_icon_tp_podium_spring.png" loading="lazy" alt="profile picture"></div> <div class="team-picture"><img src="img/Gilroy_Hacks_Logo_icon_tp_podium_spring.png" loading="lazy" alt="profile picture"></div>
<div class="team-description"> <div class="team-description">
<h4 class="person-name">Jonathan Tessmann</h4> <h4 class="person-name">Jonathan Tessmann</h4>
<h5 class="person-subtitle">Sponsor Outreach</h5> <h5 class="person-subtitle">Outreach Assist</h5>
<h5 class="person-contact"><span class="tooltip discord"><svg class="discord-icon" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 16"> <h5 class="person-contact"><span class="tooltip discord"><svg class="discord-icon" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 16">
<path d="M13.545 2.907a13.227 13.227 0 0 0-3.257-1.011.05.05 0 0 0-.052.025c-.141.25-.297.577-.406.833a12.19 12.19 0 0 0-3.658 0 8.258 8.258 0 0 0-.412-.833.051.051 0 0 0-.052-.025c-1.125.194-2.22.534-3.257 1.011a.041.041 0 0 0-.021.018C.356 6.024-.213 9.047.066 12.032c.001.014.01.028.021.037a13.276 13.276 0 0 0 3.995 2.02.05.05 0 0 0 .056-.019c.308-.42.582-.863.818-1.329a.05.05 0 0 0-.01-.059.051.051 0 0 0-.018-.011 8.875 8.875 0 0 1-1.248-.595.05.05 0 0 1-.02-.066.051.051 0 0 1 .015-.019c.084-.063.168-.129.248-.195a.05.05 0 0 1 .051-.007c2.619 1.196 5.454 1.196 8.041 0a.052.052 0 0 1 .053.007c.08.066.164.132.248.195a.051.051 0 0 1-.004.085 8.254 8.254 0 0 1-1.249.594.05.05 0 0 0-.03.03.052.052 0 0 0 .003.041c.24.465.515.909.817 1.329a.05.05 0 0 0 .056.019 13.235 13.235 0 0 0 4.001-2.02.049.049 0 0 0 .021-.037c.334-3.451-.559-6.449-2.366-9.106a.034.034 0 0 0-.02-.019Zm-8.198 7.307c-.789 0-1.438-.724-1.438-1.612 0-.889.637-1.613 1.438-1.613.807 0 1.45.73 1.438 1.613 0 .888-.637 1.612-1.438 1.612Zm5.316 0c-.788 0-1.438-.724-1.438-1.612 0-.889.637-1.613 1.438-1.613.807 0 1.451.73 1.438 1.613 0 .888-.631 1.612-1.438 1.612Z"/> <path d="M13.545 2.907a13.227 13.227 0 0 0-3.257-1.011.05.05 0 0 0-.052.025c-.141.25-.297.577-.406.833a12.19 12.19 0 0 0-3.658 0 8.258 8.258 0 0 0-.412-.833.051.051 0 0 0-.052-.025c-1.125.194-2.22.534-3.257 1.011a.041.041 0 0 0-.021.018C.356 6.024-.213 9.047.066 12.032c.001.014.01.028.021.037a13.276 13.276 0 0 0 3.995 2.02.05.05 0 0 0 .056-.019c.308-.42.582-.863.818-1.329a.05.05 0 0 0-.01-.059.051.051 0 0 0-.018-.011 8.875 8.875 0 0 1-1.248-.595.05.05 0 0 1-.02-.066.051.051 0 0 1 .015-.019c.084-.063.168-.129.248-.195a.05.05 0 0 1 .051-.007c2.619 1.196 5.454 1.196 8.041 0a.052.052 0 0 1 .053.007c.08.066.164.132.248.195a.051.051 0 0 1-.004.085 8.254 8.254 0 0 1-1.249.594.05.05 0 0 0-.03.03.052.052 0 0 0 .003.041c.24.465.515.909.817 1.329a.05.05 0 0 0 .056.019 13.235 13.235 0 0 0 4.001-2.02.049.049 0 0 0 .021-.037c.334-3.451-.559-6.449-2.366-9.106a.034.034 0 0 0-.02-.019Zm-8.198 7.307c-.789 0-1.438-.724-1.438-1.612 0-.889.637-1.613 1.438-1.613.807 0 1.45.73 1.438 1.613 0 .888-.637 1.612-1.438 1.612Zm5.316 0c-.788 0-1.438-.724-1.438-1.612 0-.889.637-1.613 1.438-1.613.807 0 1.451.73 1.438 1.613 0 .888-.631 1.612-1.438 1.612Z"/>
</svg>Alsace<span class="discord-tag">#5031</span></span><br><a class="link tooltip email-link" id="email-replace-jonathan" target="_blank" href="mailto:jonathantessmann-at-gmail-dot-com">jonathantessmann (at) gmail (dot) com</a></h5> </svg>Alsace<span class="discord-tag">#5031</span></span><br><a class="link tooltip email-link" id="email-replace-jonathan" target="_blank" href="mailto:jonathantessmann-at-gmail-dot-com">jonathantessmann (at) gmail (dot) com</a></h5>

View File

@ -362,10 +362,7 @@ document.addEventListener(
function (event) { function (event) {
// If user either clicks X button OR clicks outside the modal window, then close modal by calling closeModal() // If user either clicks X button OR clicks outside the modal window, then close modal by calling closeModal()
if (!openClick && openModal == true) { if (!openClick && openModal == true) {
if ( if (event.target.matches(".button-close-modal") || !event.target.closest(".modal")) {
event.target.matches(".button-close-modal") ||
!event.target.closest(currentModal)
) {
closeModal(currentModal); closeModal(currentModal);
} }
} }