Skip to content

Commit

Permalink
Upgraded website
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nathan95567
Nathan95567 committed Nov 26, 2023
1 parent a017abd commit ca096e0
Show file tree
Hide file tree
Showing 8 changed files with 110 additions and 8 deletions.
Binary file modified .DS_Store
View file
Binary file not shown.
Binary file modified homepage/.DS_Store
View file
Binary file not shown.
24 changes: 23 additions & 1 deletion homepage/assets/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ body{
opacity: 1;
}
}
.navbar-item:hover {
.navbar-item:hover , .bottombar-item:hover{
transition-delay: 0.1s;
transform: scale(1.25);
}
Expand Down Expand Up @@ -121,4 +121,26 @@ body{
}
.map{
width:200px;
}
.row {
width: 100%;
height: 120px;
text-align: center;
margin-bottom: 100px;
}
.portfolio-item {
position: relative;
background-color: rgba(0, 0, 0, 0.5);
display: inline-block;
overflow: hidden;
}
.row .portfolio-item{
margin-right: 30px;
margin-left: 30px;
}
#detail-portfolio-inside{
display: block;
}
.row .bottombar-item, #navbar .navbar-item, #bottombar .bottombar-item {
cursor: pointer;
}
62 changes: 59 additions & 3 deletions homepage/assets/js/script.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,66 @@
document.addEventListener('DOMContentLoaded', function() {
function move() {
// function move(bottomID) {
// if(document.getElementById('bottomID').classList.contains('hidden')) {
// document.getElementById('bottomID').classList.remove('hidden');
// } else {
// document.getElementById('bottomID').classList.add('hidden');
// }
// }
// function moveProject() {
// move('detail-project');
// }
// function moveResume() {
// move('detail-resume');
// }
// function movePortfolio() {
// move('detail-portfolio');
// }
function coverProject() {
if(!document.getElementById('detail-project').classList.contains('hidden')) {
document.getElementById('detail-project').classList.add('hidden');
}
}
function coverResume() {
if(!document.getElementById('detail-resume').classList.contains('hidden')) {
document.getElementById('detail-resume').classList.add('hidden');
}
}
function coverPortfolio() {
if(!document.getElementById('detail-portfolio').classList.contains('hidden')) {
document.getElementById('detail-portfolio').classList.add('hidden');
}
}
function moveProject() {
coverResume;
coverPortfolio;
if(document.getElementById('detail-project').classList.contains('hidden')) {
document.getElementById('detail-project').classList.remove('hidden');
}
else {
document.getElementById('detail-project').classList.add('hidden');
}
}
function moveResume() {
coverProject;
coverPortfolio;
if(document.getElementById('detail-resume').classList.contains('hidden')) {
document.getElementById('detail-resume').classList.remove('hidden');
} else {
}
else {
document.getElementById('detail-resume').classList.add('hidden');
}
}
document.getElementById('resume').onclick = move;
function movePortfolio() {
coverResume;
coverProject;
if(document.getElementById('detail-portfolio').classList.contains('hidden')) {
document.getElementById('detail-portfolio').classList.remove('hidden');
}
else {
document.getElementById('detail-portfolio').classList.add('hidden');
}
}
document.getElementById('project').onclick = moveProject;
document.getElementById('resume').onclick = moveResume;
document.getElementById('portfolio').onclick = movePortfolio;
});
Binary file added homepage/img/portfolio1.JPG
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added homepage/img/portfolio2.JPG
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added homepage/img/portfolio3.JPG
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 28 additions & 4 deletions homepage/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,47 @@ <h3>PigZzz handcrafts!</h3>
<div id="bottombar">
<div class="bottombar-item" id="project">Project</div>
<div class="bottombar-item" id="resume">Resume</div>
<div class="bottombar-item" id="porfolio">Porfolio</div>
<div class="bottombar-item" id="portfolio">Portfolio</div>
</div>
<div id="bottombar-detail">
<div class="detail hidden">
<div class="detail hidden" id="project">

</div>
<div class="detail hidden" id="detail-resume">
<img src="img/resume.jpg" width="1000">
</div>
<div class="detail hidden">

<div class="detail hidden" id="detail-portfolio">
<div id="detail-portfolio-inside">
<div class="row">
<div class="portfolio-item">
<img src="img/portfolio1.JPG" width="200" height="200">
</div>
<div class="portfolio-item">
<img src="img/portfolio2.JPG" width="200" height="200">
</div>
<div class="portfolio-item">
<img src="img/portfolio3.JPG" width="200" height="200">
</div>
</div>
<div class="row">
<div class="portfolio-item">
<!-- <img src="img/portfolio4.JPG" width="200"> -->
</div>
<div class="portfolio-item">
<img src="img/商标.png" width="500">
</div>
<div class="portfolio-item">
<!-- <img src="img/portfolio5.JPG" width="200"> -->
</div>
</div>
</div>
</div>
</div>
</div>
<div class="test hidden" id="test">
<img src="img/uparrow.png" width="85">
</div>
<div id="title"><h2>Website traffic</h2></div>
<div id="maparea">
<div class="map">
<script type="text/javascript" id="clstr_globe" src="//clustrmaps.com/globe.js?d=XMs5XW4liQnoehqlJGg4MWgrZjrmOpkTWmldn7eNDiE"></script>
Expand Down

0 comments on commit ca096e0

Please sign in to comment.