Skip to content

Restructuring assets folder #1126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 29, 2021
Merged

Restructuring assets folder #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c93e87f
restructuring assets folder
sjmiller7 Jan 26, 2021
5958ae2
Merge branch 'develop' into bh-1094
peterkos Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions assets/back_clip.svg
View file
Open in desktop

This file was deleted.

0 assets/imgs/1.jpg → assets/carousel/1.jpg
View file
Open in desktop
File renamed without changes
0 assets/imgs/10.jpg → assets/carousel/10.jpg
View file
Open in desktop
File renamed without changes
0 assets/imgs/11.jpg → assets/carousel/11.jpg
View file
Open in desktop
File renamed without changes
0 assets/imgs/2.jpg → assets/carousel/2.jpg
View file
Open in desktop
File renamed without changes
0 assets/imgs/3.jpg → assets/carousel/3.jpg
View file
Open in desktop
File renamed without changes
0 assets/imgs/4.jpg → assets/carousel/4.jpg
View file
Open in desktop
File renamed without changes
0 assets/imgs/5.jpg → assets/carousel/5.jpg
View file
Open in desktop
File renamed without changes
0 assets/imgs/6.jpg → assets/carousel/6.jpg
View file
Open in desktop
File renamed without changes
0 assets/imgs/7.jpg → assets/carousel/7.jpg
View file
Open in desktop
File renamed without changes
0 assets/imgs/8.jpg → assets/carousel/8.jpg
View file
Open in desktop
File renamed without changes
0 assets/imgs/9.jpg → assets/carousel/9.jpg
View file
Open in desktop
File renamed without changes
0 assets/footer.svg → assets/footer/footer.svg
View file
Open in desktop
File renamed without changes
3 changes: 0 additions & 3 deletions assets/front_clip.svg
View file
Open in desktop

This file was deleted.

0 assets/desk1.svg → assets/hero/desk1.svg
View file
Open in desktop
File renamed without changes
0 assets/desk2.svg → assets/hero/desk2.svg
View file
Open in desktop
File renamed without changes
0 assets/desk3.svg → assets/hero/desk3.svg
View file
Open in desktop
File renamed without changes
0 assets/wire.svg → assets/hero/lamp-wire.svg
View file
Open in desktop
File renamed without changes
0 assets/shapes.svg → assets/hero/shapes.svg
View file
Open in desktop
File renamed without changes
0 assets/shelf.svg → assets/hero/shelf.svg
View file
Open in desktop
File renamed without changes
Binary file removed assets/leadership/og/abhaya.png
View file
Open in desktop
Binary file not shown.
Binary file removed assets/leadership/og/kevin.png
View file
Open in desktop
Binary file not shown.
Binary file removed assets/leadership/og/makenna.png
View file
Open in desktop
Binary file not shown.
Binary file removed assets/leadership/og/mark.png
View file
Open in desktop
Binary file not shown.
Binary file removed assets/leadership/og/may.png
View file
Open in desktop
Binary file not shown.
Binary file removed assets/leadership/og/michael.png
View file
Open in desktop
Diff not rendered.
Binary file removed assets/leadership/og/mira.png
View file
Open in desktop
Diff not rendered.
Binary file removed assets/leadership/og/olivia.png
View file
Open in desktop
Diff not rendered.
Binary file removed assets/leadership/og/pardeep.jpg
View file
Open in desktop
Diff not rendered.
Binary file removed assets/leadership/og/peter.png
View file
Open in desktop
Diff not rendered.
26 changes: 13 additions & 13 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</div>
<div id="desk-container" class="rellax" data-rellax-speed="0" data-rellax-desktop-speed="-8">
<div id="desk"></div>
<div id="wire"></div>
<div id="lamp-wire"></div>
</div>
<div id="shelf"></div>
</section>
Expand All @@ -75,67 +75,67 @@
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/1.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/1.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/2.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/2.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/3.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/3.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/4.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/4.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/5.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/5.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/6.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/6.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/7.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/7.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/8.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/8.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/9.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/9.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/10.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/10.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/11.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/11.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
</div>
<div id="modal">
Expand Down Expand Up @@ -461,7 +461,7 @@ <h2>Partners</h2>
</div>
<div id="prospectus">
<p>Interested in sponsoring BrickHack 7?</p>
<p>View our <a href="./assets/sponsors/BrickHack 7 Prospectus.pdf">prospectus</a> and email us at <a href="mailto:[email protected]">[email protected]</a></p>
<p>View our <a href="./assets/sponsors/BrickHack 7 Prospectus.pdf" target="_blank">prospectus</a> and email us at <a href="mailto:[email protected]">[email protected]</a></p>
</div>
</section>
<footer>
Expand Down
6 changes: 3 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ new ActiveMenuLink(".navbar-items", options);


// Random hero SVG on each page load
import desk1 from './assets/desk1.svg'
import desk2 from './assets/desk2.svg'
import desk3 from './assets/desk3.svg'
import desk1 from './assets/hero/desk1.svg'
import desk2 from './assets/hero/desk2.svg'
import desk3 from './assets/hero/desk3.svg'

$(document).ready(function() {
var deskIndex = parseInt(localStorage.getItem('deskIndex'));
Expand Down
18 changes: 9 additions & 9 deletions sass/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,22 +228,22 @@ nav {
bottom: 0;
z-index: 2;

#desk, #wire {
#desk, #lamp-wire {
position: absolute;
height: 100%;
width: 100%;
background-position: bottom right;
}

#desk {
background-image: url("../assets/desk1.svg");
background-image: url("../assets/hero/desk1.svg");
background-repeat: no-repeat;
z-index: 3;
}

#wire {
#lamp-wire {
background-size: auto;
background-image: url("../assets/wire.svg");
background-image: url("../assets/hero/lamp-wire.svg");
background-repeat: repeat-y;
}
}
Expand All @@ -255,7 +255,7 @@ nav {
left: 0;
right: 0;
bottom: -20px; // Crop SVG slightly
background-image: url("../assets/shelf.svg");
background-image: url("../assets/hero/shelf.svg");
background-repeat: no-repeat;
background-position: bottom center;
background-size: cover;
Expand All @@ -268,7 +268,7 @@ nav {
height: 110%;
width: 900px;
margin-top: -80px;
background-image: url("../assets/shapes.svg");
background-image: url("../assets/hero/shapes.svg");
background-repeat: no-repeat;
background-position: 100% 30%;
background-size: 900px;
Expand Down Expand Up @@ -897,7 +897,7 @@ footer {
right: 0;
bottom: 0;
margin-top: 20px;
background-image: url("../assets/footer.svg");
background-image: url("../assets/footer/footer.svg");
background-repeat: repeat no-repeat;
background-position: bottom center;
background-size: auto 300px;
Expand Down Expand Up @@ -1040,7 +1040,7 @@ footer {
}

#desk-container {
#desk, #wire {
#desk, #lamp-wire {
background-position: calc(100% + 100px) bottom;
}
}
Expand Down Expand Up @@ -1143,7 +1143,7 @@ footer {
#desk-container {
right: -100px;

#desk, #wire {
#desk, #lamp-wire {
background-position: right bottom;
}
}
Expand Down