Skip to content

Commit 8866e54

Browse files
committed
loading projects
1 parent 7a79914 commit 8866e54

File tree

6 files changed

+60
-12
lines changed

6 files changed

+60
-12
lines changed

old_personal_site/assets/css/style.css

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ code {
146146
}
147147

148148
header {
149-
margin-top: 48px;
149+
margin-top: 32px;
150150
}
151151

152152
header#article {
@@ -269,6 +269,7 @@ nav {
269269
#project-container a {
270270
text-decoration: none;
271271
color: inherit;
272+
display: none;
272273
}
273274

274275
.project-description {
@@ -304,6 +305,32 @@ nav {
304305
font-size: 16px;
305306
}
306307

308+
#social {
309+
margin-top: 8px;
310+
display: flex;
311+
transition: 0.2s;
312+
}
313+
314+
.social__wrapper {
315+
height: 30px;
316+
width: 30px;
317+
margin-right: 24px;
318+
319+
}
320+
321+
.social__logo {
322+
height: 100%;
323+
width: 100%;
324+
object-fit: contain;
325+
transition: 0.2s;
326+
cursor: pointer;
327+
filter: saturate(0);
328+
}
329+
330+
.social__logo:hover {
331+
filter: saturate(1);
332+
}
333+
307334
@keyframes unhideProject {
308335
0% {
309336
height: 0;
@@ -433,6 +460,10 @@ nav {
433460
top: 50%;
434461
transform: translateY(-25%);
435462
}
463+
464+
#social {
465+
justify-content: center;
466+
}
436467
}
437468

438469

60.6 KB
Loading
1.94 KB
Loading
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
$(document).ready(function() {
22

3+
// prevent layout from changing
4+
$('#project-container a').each(function(project) {
5+
$(this).delay(100 * project).fadeIn('slow');
6+
});
7+
38
$(".nav-item").click(function() {
49
if ($(this).hasClass("nav-inactive")) {
510
$(".nav-item").toggleClass("nav-inactive");
611
$(".nav-item").removeClass("nav-active");
712
$(this).addClass("nav-active");
813
}
9-
})
10-
})
14+
});
15+
});

old_personal_site/index.html

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,18 @@
1616
<li class="description">// Academic Adventurer who loves movies and funky/jazzy music</li>
1717
<li class="description">// 4th Year at UC Berkeley studying cognitive science &amp; computer science</li>
1818
</ul>
19+
<div id="social">
20+
<a href="https://linkedin.com/in/jarrod-schnapper-77b337b5" target="_blank">
21+
<div class="social__wrapper">
22+
<img class="social__logo" src="assets/img/linkedIn.png">
23+
</div>
24+
</a>
25+
<a href="https://github.com/jschnapper" target="_blank">
26+
<div class="social__wrapper">
27+
<img class="social__logo" src="assets/img/Octocat.png">
28+
</div>
29+
</a>
30+
</div>
1931
</header>
2032
<nav>
2133
<div class="nav-item">Projects &amp; Experience</div>
@@ -38,12 +50,12 @@
3850
<a href="projects/emr_us/index.html">
3951
<div class="project">
4052
<div class="project-text">
41-
<div class="project-title">emrUS</div>
42-
<div class="project-description">Login screen for Emergency Medical Record Company. Created for UI Practice.</div>
53+
<div class="project-title">EMRus</div>
54+
<div class="project-description">Login screen for Emergency Medical Record company. Created for UI Practice.</div>
4355
</div>
4456
<div class="image-wrapper">
4557
<div class="project-title project-hidden">
46-
<p>Lessons in CSS</p>
58+
<p>EMRus</p>
4759
</div>
4860
<img src="assets/img/emr.png">
4961
</div>
@@ -53,7 +65,7 @@
5365
<div class="project">
5466
<div class="project-text">
5567
<div class="project-title">Personal Everything Assistant</div>
56-
<div class="project-description">A satirical website for an IOT product -- a commentary on current technological trends</div>
68+
<div class="project-description">A satirical website for an IOT product -- a commentary on current technological trends. My first website.</div>
5769
</div>
5870
<div class="image-wrapper">
5971
<div class="project-title project-hidden">
@@ -107,7 +119,10 @@
107119
</a>
108120
</div>
109121
</div>
110-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
122+
<script
123+
src="https://code.jquery.com/jquery-3.3.1.min.js"
124+
integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
125+
crossorigin="anonymous"></script>
111126
<script src="assets/js/script.js"></script>
112127
</body>
113128
</html>

old_personal_site/projects/emr_us/css/style.css

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/*
2-
Codepen results page
3-
and general selectors
4-
*/
1+
52
.page {
63
/* Position */
74
display: flex;

0 commit comments

Comments
 (0)