Skip to content

Commit

Permalink
re-designed projects page
Browse files Browse the repository at this point in the history
  • Loading branch information
Charles Wu committed Jul 14, 2018
1 parent ef28c82 commit c0005f3
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 27 deletions.
64 changes: 48 additions & 16 deletions projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,26 @@
<title>Charles's Projects</title>
<link rel="stylesheet" type="text/css" href="style.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery-Flip/1.1.2/jquery.flip.min.js"></script>
</head>
<nav>
<a href="index.html">Home</a>
<a class="active" href="projects.html">Projects</a>
</nav>
<body id="projects-pg">
<section class="project">
<h1>Synchronized Tutoring System</h1>
<p class="about-project">
Connect tutors and students with concurrent network sessions, each consisting of<br>
an instant messaging system and a sequence of virtual blackboards and embedded<br>
web browsers that are synchronized in real time across the network.
</p>
<section class="project-images">
<body id="projects-pg" onload="start()">
<section class="project" id="project1">
<section class="project-intro front">
<h1>Synchronized Tutoring System</h1>
<a href="https://github.com/charW/Synchronized-Tutoring-System"><img class="icon" src="Icons/github.png"></a>
<img class="icon" src="Icons/images.png" onclick="$('#project1').flip(true)">
<p class="about-project">
Connect tutors and students with concurrent network sessions, each consisting of<br>
an instant messaging system and a sequence of virtual blackboards and embedded<br>
web browsers that are synchronized in real time across the network.
</p>
</section>
<section class="project-images back">
<img class="icon" src="Icons/back.png" onclick="$('#project1').flip(false)">
<img class="thumbnail" src="Screenshots/TutoringSystem1.png" onmouseover="display(1, this)">
<img class="thumbnail" src="Screenshots/TutoringSystem2.png" onmouseover="display(1, this)">
<img class="thumbnail" src="Screenshots/TutoringSystem3.png" onmouseover="display(1, this)">
Expand All @@ -26,13 +32,18 @@ <h1>Synchronized Tutoring System</h1>
<img class="display" id="project1-display" src="Screenshots/TutoringSystem1.png">
</section>
</section>
<section class="project">
<h1>Media Note Taker</h1>
<p class="about-project">
Users can play video/audio files with a built-in multimedia player and take notes<br>
that get “bookmarked” along the progress bar.
</p>
<section class="project-images">
<section class="project" id="project2">
<section class="project-intro front">
<h1>Media Note Taker</h1>
<a href="https://github.com/charW/Media-Note-Taker"><img class="icon" src="Icons/github.png"></a>
<img class="icon" src="Icons/images.png" onclick="$('#project2').flip(true)">
<p class="about-project">
Users can play video or audio files with a built-in multimedia player and take notes<br>
that get “bookmarked” along the progress bar.
</p>
</section>
<section class="project-images back">
<img class="icon" src="Icons/back.png" onclick="$('#project2').flip(false)">
<img class="thumbnail" src="Screenshots/NoteTaker1.png" onmouseover="display(2, this)">
<img class="thumbnail" src="Screenshots/NoteTaker2.png" onmouseover="display(2, this)">
<img class="display" id="project2-display" src="Screenshots/NoteTaker1.png">
Expand All @@ -49,6 +60,27 @@ <h1>Media Note Taker</h1>
img.className = "thumbnail-selected";
prevImg = img;
}

function flipProject1() {
$("#project1").flip({
forceWidth: true,
forceHeight: true,
trigger: 'manual'
});
}

function flipProject2() {
$("#project2").flip({
forceWidth: true,
forceHeight: true,
trigger: 'manaul'
});
}

function start() {
flipProject1();
flipProject2();
}
</script>
</body>
</html>
49 changes: 38 additions & 11 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ html, #main-pg, #projects-pg {
height: 100%;
margin: 0;
padding: 0;
overflow: hidden;
}

#main-pg {
Expand Down Expand Up @@ -55,41 +56,61 @@ nav a, p, h1 {
font-size: 20px;
}

#projects-pg {
background: #FFFF80;
}

#projects-pg h1 {
font-weight: bold;
font-size: xx-large;
color: #25468D;
color: #FFFFFF;
}

.project {
text-align: center;
margin-top: 4%;
margin-bottom: 3%;
width: 50%;
}

#project1 {
float: left;
}

#project2 {
float: right;
}

#project1 .project-intro {
background: #FF6666;
}

#project2 .project-intro {
background: #CC33FF;
}

.project-images {
margin-top: 15%;
}

.about-project {
margin-top: 10%;
text-align: left;
display: table;
margin-left: auto;
margin-right: auto;
margin-bottom: 2%;
padding: 2%;
border: solid;
border-width: thick;
border-color: #FF9933;
background-color: #FFE683;
color: #FFFFFF;
font-size: large;
}

.display {
display: block;
margin-left: auto;
margin-right: auto;
width: 60%;
width: 90%;
}

.thumbnail-selected, .thumbnail {
display: inline-block;
width: 5%;
width: 7%;
margin-left: 0.3%;
margin-right: 0.3%;
margin-bottom: 1.2%;
Expand All @@ -101,3 +122,9 @@ nav a, p, h1 {
.thumbnail-selected {
border-color: #FF0066;
}

.icon {
margin-top: 5%;
margin-left: 2%;
margin-right: 2%;
}

0 comments on commit c0005f3

Please sign in to comment.