Skip to content
This repository was archived by the owner on Jan 24, 2023. It is now read-only.

Develop: Tons of changes #18

Merged
merged 5 commits into from
Oct 1, 2021
Merged

Develop: Tons of changes #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00d973c
uncomment header section
Zaqttack Sep 23, 2021
c711a8c
updated background images
Zaqttack Oct 1, 2021
75f28f8
Merge pull request #16 from UTSA-ACM/feature/fix_more_background_issues
Zaqttack Oct 1, 2021
c7504ec
Sponsors
Zaqttack Oct 1, 2021
748d4ef
Merge pull request #17 from UTSA-ACM/feature/new_logo_files
Zaqttack Oct 1, 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
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file modified assets/.DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion assets/css/header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "theme-variables.css";

#header {
z-index: 999;
z-index: 9999;
}

.background-header {
Expand Down
4 changes: 2 additions & 2 deletions assets/css/hero-section.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
}

.container-fluid .col-md-12 {
margin-right: 0px;
padding-right: 0px;
margin-right: 0;
padding-right: 0;
}
}
22 changes: 13 additions & 9 deletions assets/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ a:visited:active {
a.button {
-webkit-appearance: button;
-moz-appearance: button;
appearance: button;
appearance: auto;

text-decoration: none;
color: initial;
Expand Down Expand Up @@ -241,27 +241,31 @@ button.main-button:hover {
text-align: center;
}

.left-image-decor {
background-image: url(../images/left-bg-decor.png);
#hero, #about-us, #tracks, #location, #schedule, #faq, #sponsors, #connect {
position: relative;
z-index: 999;
}

.new-left-image {
background-repeat: no-repeat;
position: absolute;
width: 100%;
width: 40%;
display: inline-block;
height: 110%;
margin-top: -200px;
z-index: 1;
}

.right-image-decor {
background-image: url(../images/right-bg-decor.png);
.new-right-image {
background-repeat: no-repeat;
background-position: right center;
position: absolute;
width: 100%;
width: 40%;
margin-left: 60%;
display: inline-block;
height: 110%;
margin-top: -200px;
z-index: 1;
float: right;
}

.text-glow {
Expand All @@ -270,7 +274,7 @@ button.main-button:hover {

@-webkit-keyframes glow {
from {
text-shadow: 0 0 10px var(--primaryBackground), 0 0 20px var(--primaryBackground), 0 0 30px var(--primaryBackground), 0 0 40px var(--primaryBackground), 0 0 50px var(--primaryBprimaryBackgroundackgroundDarker), 0 0 60px var(--primaryBackground), 0 0 70px var(--primaryBackground);
text-shadow: 0 0 10px var(--primaryBackground), 0 0 20px var(--primaryBackground), 0 0 30px var(--primaryBackground), 0 0 40px var(--primaryBackground), 0 0 50px var(--primaryBackground), 0 0 60px var(--primaryBackground), 0 0 70px var(--primaryBackground);
}

to {
Expand Down
28 changes: 24 additions & 4 deletions assets/css/sponsorship-section.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,30 @@
/* border-radius: 15px;*/
/*}*/

#sponsors img {
width: 465px;
}
/*#sponsors img {*/
/* width: 465px;*/
/*}*/

#sponsors .image-container {
height: 330px;
height: 200px;
}

#sponsors .image-restrictions {
max-height: 330px;
max-width: 275px;
position: relative;
top: 50%;
transform: translateY(-50%);
}

@media (max-width: 975px) {
#sponsors .image-restrictions {
max-width: 225px;
}
}

@media (max-width: 767px) {
#sponsors .image-restrictions {
max-width: 150px;
}
}
Binary file modified assets/images/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file modified assets/images/sponsors/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file removed assets/images/sponsors/Google Maps.pdf
View file
Open in desktop
Binary file not shown.
Binary file removed assets/images/sponsors/HEB.png
View file
Open in desktop
Binary file not shown.
Binary file added assets/images/sponsors/google-cloud.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/images/sponsors/google.png
View file
Open in desktop
Binary file not shown.
Binary file added assets/images/sponsors/jpmorgan-chase-logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/images/sponsors/jpmorgan-chase.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed assets/images/sponsors/jpmorgan-chase.png
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion assets/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
autoplay: true,
autoplaySpeed: 1500,
arrows: false,
pauseOnHover: false,
initialSlide: randomFirstSlide(),
responsive: [
{
Expand All @@ -113,7 +114,7 @@
breakpoint: 767,
settings: {
slidesToShow: 2,
slidesToScroll: 2,
slidesToScroll: 1,
}
}
]
Expand Down
36 changes: 24 additions & 12 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<li class="scroll-to-section"><a href="#location" class="menu-item">Location</a></li>
<!-- <li class="scroll-to-section"><a href="#schedule" class="menu-item">Schedule</a></li>-->
<li class="scroll-to-section"><a href="#faq" class="menu-item">F.A.Q.</a></li>
<!-- <li class="scroll-to-section"><a href="#sponsors" class="menu-item">Sponsors</a></li>-->
<li class="scroll-to-section"><a href="#sponsors" class="menu-item">Sponsors</a></li>
<!-- <li class="scroll-to-section"><a href="#connect" class="menu-item">Connect</a></li>-->
</ul>
<a class="menu-trigger">
Expand Down Expand Up @@ -79,7 +79,7 @@ <h2 style="margin-bottom: 25px;">October 23 - 24, 2021</h2>
</div>
</div>

<div class="left-image-decor"></div>
<img src="assets/images/left-bg-decor.png" class="new-left-image" alt="background image">

<section id="about-us">
<div class="container">
Expand Down Expand Up @@ -151,7 +151,7 @@ <h4>Beginner Track</h4>
</div>
</section>

<div class="right-image-decor"></div>
<img src="assets/images/right-bg-decor.png" class="new-right-image" alt="background image">

<section id="location">
<div class="container">
Expand Down Expand Up @@ -187,7 +187,7 @@ <h2>The <em>Location</em></h2>
<!-- <a href="" class="main-button button">Coming Soon!</a>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div> -->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </section>-->
Expand Down Expand Up @@ -289,7 +289,7 @@ <h2>The <em>F.A.Q.</em></h2>
</div>
</section>

<div class="left-image-decor"></div>
<img src="assets/images/left-bg-decor.png" class="new-left-image" alt="background image">

<section id="sponsors">
<div class="container">
Expand All @@ -300,14 +300,26 @@ <h2>Meet our <em>Sponsors</em></h2>
<p>Without them, events like this would not be possible!</p> <!-- need to increase this font size -->
</div>
</div>
<div class="offset-lg-1 col-lg-10 col-md-12 col-sm-12 mobile-bottom-fix-big align-items-center" data-scroll-reveal="enter left move 30px over 0.6s after 0.4s">
<div class="offset-lg-1 col-lg-10 col-md-12 col-sm-12 mobile-bottom-fix-big" data-scroll-reveal="enter left move 30px over 0.6s after 0.4s">
<div class="row sponsor-carousel">
<img src="assets/images/sponsors/google.png" alt="Google logo" style="margin-top: 20px;">
<img src="assets/images/sponsors/paycom.png" alt="Paycom logo">
<img src="assets/images/sponsors/H-E-B.png" alt="HEB logo" style="margin-top: 115px;">
<img src="assets/images/sponsors/matrix.png" alt="MATRIX AI logo">
<img src="assets/images/sponsors/valero.png" alt="Valero logo" style="margin-top: 65px;">
<img src="assets/images/sponsors/jpmorgan-chase.png" alt="JP Morgan Chase logo" style="margin-top: 20px;">
<div style="padding: 5px" class="col image-container">
<img src="assets/images/sponsors/google-cloud.png" alt="Google logo" class="mx-auto d-block image-restrictions"><!--style="margin-top: 155px;">-->
</div>
<div style="padding: 5px" class="image-container">
<img src="assets/images/sponsors/paycom.png" alt="Paycom logo" class="mx-auto d-block image-restrictions">
</div>
<div style="padding: 5px" class="image-container">
<img src="assets/images/sponsors/H-E-B.png" alt="HEB logo" class="mx-auto d-block image-restrictions"><!-- style="margin-top: 115px;">-->
</div>
<div style="padding: 5px" class="image-container">
<img src="assets/images/sponsors/matrix.png" alt="MATRIX AI logo" class="mx-auto d-block image-restrictions">
</div>
<div style="padding: 5px" class="image-container">
<img src="assets/images/sponsors/valero.png" alt="Valero logo" class="mx-auto d-block image-restrictions"><!-- style="margin-top: 65px;">-->
</div>
<div style="padding: 5px" class="image-container">
<img src="assets/images/sponsors/jpmorgan-chase-logo.png" alt="JP Morgan Chase logo" class="mx-auto d-block image-restrictions"><!-- style="margin-top: 90px;">-->
</div>
</div>
</div>
</div>
Expand Down