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

Commit 4dc9b0e

Browse files
authored
Merge pull request #18 from UTSA-ACM/develop
Develop: Tons of changes
2 parents 3ce8d0d + 748d4ef commit 4dc9b0e

17 files changed

+66
-29
lines changed

.DS_Store

0 Bytes
Binary file not shown.

assets/.DS_Store

0 Bytes
Binary file not shown.

assets/css/header.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import "theme-variables.css";
22

33
#header {
4-
z-index: 999;
4+
z-index: 9999;
55
}
66

77
.background-header {

assets/css/hero-section.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
}
104104

105105
.container-fluid .col-md-12 {
106-
margin-right: 0px;
107-
padding-right: 0px;
106+
margin-right: 0;
107+
padding-right: 0;
108108
}
109109
}

assets/css/main.css

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ a:visited:active {
7979
a.button {
8080
-webkit-appearance: button;
8181
-moz-appearance: button;
82-
appearance: button;
82+
appearance: auto;
8383

8484
text-decoration: none;
8585
color: initial;
@@ -241,27 +241,31 @@ button.main-button:hover {
241241
text-align: center;
242242
}
243243

244-
.left-image-decor {
245-
background-image: url(../images/left-bg-decor.png);
244+
#hero, #about-us, #tracks, #location, #schedule, #faq, #sponsors, #connect {
245+
position: relative;
246+
z-index: 999;
247+
}
248+
249+
.new-left-image {
246250
background-repeat: no-repeat;
247251
position: absolute;
248-
width: 100%;
252+
width: 40%;
249253
display: inline-block;
250254
height: 110%;
251255
margin-top: -200px;
252256
z-index: 1;
253257
}
254258

255-
.right-image-decor {
256-
background-image: url(../images/right-bg-decor.png);
259+
.new-right-image {
257260
background-repeat: no-repeat;
258-
background-position: right center;
259261
position: absolute;
260-
width: 100%;
262+
width: 40%;
263+
margin-left: 60%;
261264
display: inline-block;
262265
height: 110%;
263266
margin-top: -200px;
264267
z-index: 1;
268+
float: right;
265269
}
266270

267271
.text-glow {
@@ -270,7 +274,7 @@ button.main-button:hover {
270274

271275
@-webkit-keyframes glow {
272276
from {
273-
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);
277+
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);
274278
}
275279

276280
to {

assets/css/sponsorship-section.css

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,30 @@
55
/* border-radius: 15px;*/
66
/*}*/
77

8-
#sponsors img {
9-
width: 465px;
10-
}
8+
/*#sponsors img {*/
9+
/* width: 465px;*/
10+
/*}*/
1111

1212
#sponsors .image-container {
13-
height: 330px;
13+
height: 200px;
14+
}
15+
16+
#sponsors .image-restrictions {
17+
max-height: 330px;
18+
max-width: 275px;
19+
position: relative;
20+
top: 50%;
21+
transform: translateY(-50%);
1422
}
23+
24+
@media (max-width: 975px) {
25+
#sponsors .image-restrictions {
26+
max-width: 225px;
27+
}
28+
}
29+
30+
@media (max-width: 767px) {
31+
#sponsors .image-restrictions {
32+
max-width: 150px;
33+
}
34+
}

assets/images/.DS_Store

0 Bytes
Binary file not shown.

assets/images/sponsors/.DS_Store

0 Bytes
Binary file not shown.
-51.2 KB
Binary file not shown.

assets/images/sponsors/HEB.png

-59.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)