Skip to content

Commit

Permalink
Merge pull request #19 from augusvornehm/augusvornehm-patch-9-1
Browse files Browse the repository at this point in the history
Add files via upload
  • Loading branch information
augusvornehm authored Apr 5, 2024
2 parents 66db778 + 7e6d0dc commit 5e28064
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 24 deletions.
18 changes: 9 additions & 9 deletions about.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h2>Our Team</h2>

<!-- Goda -->
<div class="team-member" id="person1">
<img src="images/Goda.png" alt="Headshot Nimish" class="member-photo">
<img src="images/Goda.png" alt="Headshot Goda" class="member-photo">
<div class="member-intro">
<span>Marketing Manager<br>Content and Research</span>
<h3>Goda Vertelkaite</h3>
Expand Down Expand Up @@ -136,7 +136,7 @@ <h3>Birte Neubauer</h3>

<!-- Nimish -->
<div class="team-member" id="person4">
<img src="images/Nimish.jpg" alt="Headshot Marina" class="member-photo">
<img src="images/Nimish.jpg" alt="Headshot Nimish" class="member-photo">
<div class="member-intro">
<span>Interactive Model Functionality
<br> 3D Model Styling
Expand Down Expand Up @@ -165,7 +165,7 @@ <h3>Nimish KC</h3>

<!-- Marina -->
<div class="team-member" id="person5">
<img src="images/Marina.jpg" alt="Headshot Goda" class="member-photo">
<img src="images/Marina.jpg" alt="Headshot Marina" class="member-photo">
<div class="member-intro">
<span>Web Accessibility Manager
</span>
Expand Down Expand Up @@ -198,7 +198,7 @@ <h3>Xinchen Zhu</h3>

<!-- Other sections for about us -->

<section class="section1" id="our-vision">
<section class="section2" id="our-vision">
<div class="image-text-section">

<div class="image-wrapper-right" id="vision">
Expand Down Expand Up @@ -250,7 +250,7 @@ <h2>Our Project</h2>
</svg>


<section>
<section class="section1">
<span>Part One</span>
<h3>The Concept</h3>

Expand All @@ -260,7 +260,7 @@ <h3>The Concept</h3>
</div>
</section>

<section>
<section class="section1">
<span class="anim">Part Two</span>
<h3 class="anim">The Design</h3>

Expand All @@ -270,7 +270,7 @@ <h3 class="anim">The Design</h3>
</div>
</section>

<section>
<section class="section1">
<span class="anim">Part Three</span>
<h3 class="anim">The Development</h3>

Expand All @@ -280,7 +280,7 @@ <h3 class="anim">The Development</h3>
</div>
</section>

<section>
<section class="section1">
<span class="anim">Part Four</span>
<h3 class="anim">The Interactivity</h3>

Expand All @@ -290,7 +290,7 @@ <h3 class="anim">The Interactivity</h3>
</div>
</section>

<section>
<section class="section1">
<span class="anim">Part Five</span>
<h3 class="anim">The Accessibility</h3>

Expand Down
6 changes: 3 additions & 3 deletions gsap.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
//Scroller
const container = document.querySelector('.timeline_project');
const selections = gsap.utils.toArray('.timeline_project section');
const selections = gsap.utils.toArray('.timeline_project section1');
const etxts = gsap.utils.toArray('.anim');
const mask = document.querySelector('.mask');

// Calculate the total width of all text sections
let totalWidth = 0;
selections.forEach(section => {
totalWidth += section.offsetWidth;
selections.forEach(section1 => {
totalWidth += section1.offsetWidth;
});

//scroll trigger (scrolling = moving right on timeline)
Expand Down
6 changes: 0 additions & 6 deletions homepage.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@
<!-- Banner -->
<section class="banner">
<h1>El Sagrado Secreto De Gaudí</h1>
<button class="banner-left-arrow">
<img src="images/arrow-left-black.png" alt="Left Arrow">
</button>
<button class="banner-right-arrow">
<img src="images/arrow-right-black.png" alt="Right Arrow">
</button>
<div id="banner-left">
<img src="images/architecture.png" alt="Sagrada Familia aquarell image representing architectural view" id="left-image">
</div>
Expand Down
12 changes: 6 additions & 6 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ span {

.filler2 {
padding: 1.5625rem;
background-color: #f9f9f9;
background-color: #f2f4f3;
}

.line-divider {
Expand All @@ -594,7 +594,7 @@ span {

.section2 {
height: auto;
background: #f9f9f9;
background: #f2f4f3;
color: #000;
padding: 6.25rem;
}
Expand Down Expand Up @@ -701,7 +701,7 @@ span {
padding-top: 3.125rem;
}
.three-blocks-text-block-gray{
background-color: #f9f9f9;
background-color: #f2f4f3;
padding:1.5625rem;
border-radius: 8px;
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
Expand Down Expand Up @@ -808,7 +808,7 @@ span {
.reviewer-photo {
width: 150px;
height: 150px;
background-color: #f9f9f9; /* Example background color for photo */
background-color: #f2f4f3; /* Example background color for photo */
border-radius: 50%;
overflow: hidden; /* Ensure the image stays within the container */
grid-column: 2;
Expand Down Expand Up @@ -1554,7 +1554,7 @@ section {
}

.text-box-timeline {
background-color: #f9f9f9;
background-color: #f2f4f3;
padding: 0.625rem;
height: 10rem;
border-end-end-radius: 8px;
Expand Down Expand Up @@ -1866,7 +1866,7 @@ section {

.options-container-box {
position: relative;
background-color: #f9f9f9;
background-color: #f2f4f3;
padding: 0 1.5625rem 1.5625rem 1.5625rem;
border-radius: 8px;
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
Expand Down

0 comments on commit 5e28064

Please sign in to comment.