Skip to content

Commit

Permalink
Merge pull request #3 from JonathanGin52/master
Browse files Browse the repository at this point in the history
Fix semantic errors
  • Loading branch information
JessicaLim8 committed Oct 26, 2020
2 parents 7b57609 + 0f1822e commit d3785b0
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 57 deletions.
1 change: 1 addition & 0 deletions css/landing.css
Expand Up @@ -20,6 +20,7 @@ h1 {
color: white;
padding: 8px;
font-size: 2em;
text-decoration: none;
}

.social-icon:hover {
Expand Down
78 changes: 38 additions & 40 deletions index.html
Expand Up @@ -38,51 +38,49 @@
<meta name="keywords" content="Jessica, Lim, Jessica Lim, Jessica Lim website, Jessica webiste, mcmaster ibiomed, mcmaster biomedical engineering">
</head>
<body>
<section id="websitePage">
<div id="websitePage">

<section id="main" class="layer">
<div class="contentWrap">
<div class="infoSection contentBody fullWidth" />
<div class="infoSection contentBody fullWidth">
<div class="mainDiv">
<img id="imgMe" src="images/me.png" alt="picture of me" />
<img id="imgMe" src="images/me.png" alt="picture of me">
</div>
<div class="mainDiv">
<h1>Hi, I'm Jessica Lim &#x1F44B</h1>
<h1>Hi, I'm Jessica Lim &#x1F44B;</h1>
<p class="extraPadding">I like trying new things and creating the unimagined</p>
<nav>
<ul class="button">
<li>
<a href="https://www.linkedin.com/in/jlim/" target="_blank" aria-label="Link to Linkedin" class="social-icon">
<span class="fab fa-linkedin" aria-hidden="true"><span/>
</a>
<li/>
<li>
<a href="https://medium.com/@_jessicalim" target="_blank" aria-label="Link to medium" class="social-icon">
<span class="fab fa-medium"><span/>
</a>
<li/>
<li>
<a href="https://github.com/JessicaLim8" target="_blank" aria-label="Link to github" class="social-icon">
<span class="fab fa-github-square"><span/>
</a>
<li/>
<li>
<a href="https://twitter.com/_jesslim" target="_blank" aria-label="Link to twitter" class="social-icon">
<span class="fab fa-twitter-square" aria-hidden="true"><span/>
</a>
<li/>
<li>
<a href="mailto:jessicalim813@gmail.com" target="_blank" aria-label="Link to Mail" class="social-icon">
<span class="fas fa-envelope-square" aria-hidden="true"><span/>
</a>
<li/>
<li>
<a href="files/JessicaLim_Resume.pdf" target="_blank" aria-label="Link to Resume" class="social-icon">
<span class="far fa-sticky-note" aria-hidden="true"><span/>
</a>
</li>
</ul>
</nav>
<ul class="button">
<li>
<a href="https://www.linkedin.com/in/jlim/" target="_blank" aria-label="Link to Linkedin" class="social-icon">
<span class="fab fa-linkedin" aria-hidden="true"></span>
</a>
</li>
<li>
<a href="https://medium.com/@_jessicalim" target="_blank" aria-label="Link to medium" class="social-icon">
<span class="fab fa-medium"></span>
</a>
</li>
<li>
<a href="https://github.com/JessicaLim8" target="_blank" aria-label="Link to github" class="social-icon">
<span class="fab fa-github-square"></span>
</a>
</li>
<li>
<a href="https://twitter.com/_jesslim" target="_blank" aria-label="Link to twitter" class="social-icon">
<span class="fab fa-twitter-square" aria-hidden="true"></span>
</a>
</li>
<li>
<a href="mailto:jessicalim813@gmail.com" target="_blank" aria-label="Link to Mail" class="social-icon">
<span class="fas fa-envelope-square" aria-hidden="true"></span>
</a>
</li>
<li>
<a href="files/JessicaLim_Resume.pdf" target="_blank" aria-label="Link to Resume" class="social-icon">
<span class="far fa-sticky-note" aria-hidden="true"></span>
</a>
</li>
</ul>
</div>
</div>
</div>
Expand All @@ -98,15 +96,15 @@ <h3 class="inline reducePadding"> • \ ˈmē \</h3>
<h3 class="reducePadding dictFont"><em>Pronoun</em></h3>
<ul class="definitions">
<li>Former Software Engineering Intern at Microsoft (Summer 2020)</li>
<li>Freelance Writer (Check out my Medium blog <a href="https://medium.com/@_jessicalim">here<a/>) </li>
<li>Freelance Writer (Check out my <a href="https://medium.com/@_jessicalim">Medium blog</a>)</li>
<li>McMaster Biomedical & Software Engineering Student</li>
<li>Varsity Field Hockey athlete & adventure seeker</li>
</ul>
</div>
</div>
</section>
<!--div id="slider" aria-hidden="true"></div-->
</section>
</div>
<script src="js/slider.js"></script>
</body>
</html>
34 changes: 17 additions & 17 deletions js/slider.js
@@ -1,21 +1,21 @@
window.addEventListener('DOMContentLoaded', () => {
let wrapper = document.getElementById('websitePage');
let topLayer = wrapper.querySelector('#main');
let slider = wrapper.querySelector('#slider');
let skew = 1000;
let allowDrag = true;
let delta = 0;
let wrapper = document.getElementById('websitePage');
let topLayer = wrapper.querySelector('#main');
// let slider = wrapper.querySelector('#slider');
let skew = 1000;
let allowDrag = true;
let delta = 0;

const moveSlider = (event) => {
delta = (event.clientX - window.innerWidth / 2) * 0.5;
topLayer.style.width = event.clientX + skew + delta + 'px';
//slider.style.left = event.clientX + skew + delta + 'px';
};
const moveSlider = (event) => {
delta = (event.clientX - window.innerWidth / 2) * 0.5;
topLayer.style.width = event.clientX + skew + delta + 'px';
//slider.style.left = event.clientX + skew + delta + 'px';
};

wrapper.addEventListener('click', (event) => {
if (window.innerWidth > 768) {
allowDrag ? wrapper.addEventListener('mousemove', moveSlider) : wrapper.removeEventListener('mousemove', moveSlider);
allowDrag = !allowDrag;
}
});
wrapper.addEventListener('click', (event) => {
if (window.innerWidth > 768) {
allowDrag ? wrapper.addEventListener('mousemove', moveSlider) : wrapper.removeEventListener('mousemove', moveSlider);
allowDrag = !allowDrag;
}
});
});

0 comments on commit d3785b0

Please sign in to comment.