From cf64837254c437e06a89ac2e616d4c06da0ba988 Mon Sep 17 00:00:00 2001 From: MichaelDHellman <113139851+MichaelDHellman@users.noreply.github.com> Date: Mon, 25 Mar 2024 12:28:22 -0500 Subject: [PATCH 1/4] Update Olympics and custom for new olympics season --- custom.css | 277 ++++++++++++++++++++ olympics.html | 704 ++++++++++++++++++++++++-------------------------- 2 files changed, 612 insertions(+), 369 deletions(-) create mode 100644 custom.css diff --git a/custom.css b/custom.css new file mode 100644 index 0000000..7195e5e --- /dev/null +++ b/custom.css @@ -0,0 +1,277 @@ +@font-face { + font-family: "erbos-draco"; + src: local("../fonts/ErbosDraco1StNbpRegular-99V5.ttf"); + font-weight: normal; + font-style: normal; +} + +.nav-1:hover { + background: rgba(0, 0, 0, 0); +} + +.nav-1 ul li { + border-right: 1px solid rgba(255, 255, 255, 0.0); +} +.nav-1 ul li:first-child { + border-left: 1px solid rgba(255, 255, 255, 0.0); +} + +.nav-1 .logo { + max-height: 80px; + max-width: 100%; + margin-right: 64px; + margin-top: 19px; + padding-bottom: 20px; +} + +.nav-1 ul > li:hover { + border-left: 1px solid rgba(255, 255, 255, 0.0); +} + +.main-hero { + padding-top: 70px; + padding-bottom: 70px; +} + +.news-header { + margin-left: -15px; + font-size: 24px; + font-weight: 600; +} + +.events-header { + font-size: 24px; + font-weight: 600; +} + +.featured-blog-image-holder { + background-color: transparent !important; + background-blend-mode: multiply; +} + +.featured-blog-image-holder::before { + background-color: black !important; + opacity: 0.7; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + display: block; + content: ""; +} + +.blog-pagination { + display: block; + margin-left: auto; + margin-right: auto; + width: auto; + text-align: center; +} + +.blog-post-image { + background-size: cover; + background-repeat: no-repeat; + height: 300px; +} + +@media all and (max-width: 1023px) { + .nav-1 .logo { + max-height: 60px; + max-width: 100%; + margin-right: 64px; + margin-top: 10px; + } + + .nav-1:hover { + background: rgba(30, 30, 30, 0.9); + } +} + +@media (max-width: 768px) { + .left-align-mobile { + text-align: left; + } + + .mobile-grid { + width: 50%; + margin-left: 22vw; + } + + .home-hero { + padding-left: 20px; + } + + .events-section { + padding-left: 0px; + } +} + +@media (max-width: 640px) { + .mobile-grid { + width: 70%; + margin-left: 15vw; + } +} + +@media (max-width: 400px) { + .mobile-grid { + width: 100%; + margin-left: 0vw; + } +} + +@media all and (max-width: 992px) and (min-width: 450px) { + .officers { + width: 50% !important; + float: left; + } +} + +.nav-1 ul li a { + padding: 40px 16px; +} + +.has-dropdown:before { + top: 40px; +} + +.nav-1 .social-links a { + padding: 20px 0px; +} + +.nav-1 { + background: rgba(0, 0, 0, 0); + position: absolute; +} + +.contrast-white-p { + color: #fff !important; + opacity: 0.6; +} +.contrast-white div{ + color: #fff !important; + opacity: 0.8; +} +.contrast-white strong { + color: #fff !important; + opacity: 1.0; +} +.contrast-white-detail{ + background: #fff !important; + opacity: 0.9; +} + +.job-desc a { + line-height: 32px; +} + +.col-md-6:nth-child(odd) { + clear: left; +} + +.col-md-3:nth-child(4n+1) { + clear: left; +} + +.zoom { + transition: .1s; +} + +.zoom:hover { + transform: scale(1.1); /* (150% zoom - Note: if the zoom is too large, it will go outside of the viewport) */ +} + +.dark-back { + background-color: #2f2f2f; +} + +.tables-h1 { + font-size: 36px; + font-weight: 300; + line-height: 0px; + color: #ffffff; +} + +.sch-box { + background-color: #151515; + border-radius: 25px; + border: 2px solid #999999; + width:30%; + height:170px; + font-size: 2.5vw; + line-height: 7vh; +} + +.flex-sch-container { + display: flex; + flex-direction: row; + margin-left: 60px; + margin-right: 60px; + margin-top: 50px; + align-items: top; + justify-content: space-around; +} + +@media (max-width: 550px){ + .sch-box { + width:100%; + font-size: 5.75vw; + line-height: 8vh; + } + .flex-sch-container{ + flex-direction: column; + } +} + +.events-box { + width: 100%; + float: right; + border: 0px; + margin-top: 10px; +} + +.sch-table{ + width:100%; + margin-left:5px; +} + +.fri-box { + height: 43vh; +} + +.sat-box { + height: 64vh; +} + +.sun-box { + height: 50vh; +} + +.sch-head { + color: #d1ce20; + font-size: 4.5 vw; + text-align: center; + line-height: 7vh; +} + +.event-div { + color: #d1ce20; + font-weight: 400; + font-family: 'Handjet', cursive; + font-weight: normal; + font-style: normal; + border-radius: 25px; + border: none; + margin-left: 3px; + margin-right: 3px; +} + +.sch-orange { + color: #ca5400; + display: inline; + float: right; + text-align:right; + margin-right: 5px; +} + diff --git a/olympics.html b/olympics.html index 8fa38f1..7fe7bd3 100644 --- a/olympics.html +++ b/olympics.html @@ -1,369 +1,335 @@ ---- -layout: none ---- - - - - - ACM · The Association for Computing Machinery at UTD - - - - - - - {% include common-head.html %} - - - {% include common-nav.html %} - -
- -
- -
-
-
-
-

- ACM Olympics is a weekend-long multi-sport event held annually at UTD. - Combing atheletic, academic, and utterly random events, Olympics has something for everyone. - Come join us for a fantastic time meeting new people, participating in competitive events, and - having more fun than everyone not participating. -

-
-
-
-
- -
-
-
-
-

-

- Check out our schedule of events -

-

-
-
-
-
-
-
-
-

- Friday -

- - - - - - - - - - - - - - - - - -
EventTime
Opening Ceremony4:00 PM
Typing5:15 PM
Soccer6:30 PM
-
-
-
-
-
-
-

- Saturday -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
EventTime
Push Ups11:00 AM
One Mile Run11:30 AM
Table Tennis12:15 PM
Mystery Event2:00 PM
Programming3:15 PM
Basketball4:30 PM
Smash Bros6:45 PM
-
-
-
-
-
-
-

- Sunday -

- - - - - - - - - - - - - - - - - -
EventTime
Volleyball1:30 PM
Trivia3:45 PM
Closing Ceremony5:30 PM
-
-
-
-
-
-
-
-
-
-
-

- Join ACM Olympics - as a participant. - Or, - as a volunteer. -

-
-
-
-
- - - - {% include common-footer.html %} -
- - - - - - - - - - - - - - - - +--- +layout: none +--- + + + + + ACM · The Association for Computing Machinery at UTD + + + + + + + {% include common-head.html %} + + + {% include common-nav.html %} + +
+ +
+ +
+
+
+
+

+ ACM Olympics is a weekend-long multi-sport event held annually at UTD. + Combing atheletic, academic, and utterly random events, Olympics has something for everyone. + Come join us for a fantastic time meeting new people, participating in competitive events, and + having more fun than everyone not participating. +

+
+
+
+
+ +
+
+
+
+

+

+ Check out our schedule of events +

+

+
+
+
+
+
+
+
+

+ Friday +

+ + + + + + + + + + + + + + + + + + + + + +
EventTime
Opening Ceremony4:00 PM
Typing5:30 PM
Trivia7:00 PM
Soccer8:15 PM
+
+
+
+
+
+
+

+ Saturday +

+ + + + + + + + + + + + + + + + + + + + + + + + + +
EventTime
Programming1:00 PM
Event Rush3:00 PM
Mystery Event5:30 PM
Table Tennis6:30 PM
Smash Bros7:45 PM
+
+
+
+
+
+
+

+ Sunday +

+ + + + + + + + + + + + + + + + + + + + + +
EventTime
Chess10:30 AM
Basketball1:00 PM
Water Fight4:00 PM
Closing Ceremony6:00 PM
+
+
+
+
+
+
+
+
+
+
+

+ Join ACM Olympics + as a participant. + Or, + as a volunteer. +

+
+
+
+
+ + + + {% include common-footer.html %} +
+ + + + + + + + + + + + + + + + \ No newline at end of file From 8fd8a9881a09d2c87553b8e9ccf42e1307bea138 Mon Sep 17 00:00:00 2001 From: MichaelDHellman <113139851+MichaelDHellman@users.noreply.github.com> Date: Mon, 25 Mar 2024 12:32:26 -0500 Subject: [PATCH 2/4] update css for new olympics season --- css/custom.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/custom.css b/css/custom.css index 05879c7..7195e5e 100644 --- a/css/custom.css +++ b/css/custom.css @@ -241,11 +241,11 @@ } .sat-box { - height: 70vh; + height: 64vh; } .sun-box { - height: 43vh; + height: 50vh; } .sch-head { From e4f76cbe95574a01d9d53a8158f6962501ae4ca7 Mon Sep 17 00:00:00 2001 From: MichaelDHellman <113139851+MichaelDHellman@users.noreply.github.com> Date: Mon, 25 Mar 2024 12:34:17 -0500 Subject: [PATCH 3/4] Delete erroneous custom.css --- custom.css | 277 ----------------------------------------------------- 1 file changed, 277 deletions(-) delete mode 100644 custom.css diff --git a/custom.css b/custom.css deleted file mode 100644 index 7195e5e..0000000 --- a/custom.css +++ /dev/null @@ -1,277 +0,0 @@ -@font-face { - font-family: "erbos-draco"; - src: local("../fonts/ErbosDraco1StNbpRegular-99V5.ttf"); - font-weight: normal; - font-style: normal; -} - -.nav-1:hover { - background: rgba(0, 0, 0, 0); -} - -.nav-1 ul li { - border-right: 1px solid rgba(255, 255, 255, 0.0); -} -.nav-1 ul li:first-child { - border-left: 1px solid rgba(255, 255, 255, 0.0); -} - -.nav-1 .logo { - max-height: 80px; - max-width: 100%; - margin-right: 64px; - margin-top: 19px; - padding-bottom: 20px; -} - -.nav-1 ul > li:hover { - border-left: 1px solid rgba(255, 255, 255, 0.0); -} - -.main-hero { - padding-top: 70px; - padding-bottom: 70px; -} - -.news-header { - margin-left: -15px; - font-size: 24px; - font-weight: 600; -} - -.events-header { - font-size: 24px; - font-weight: 600; -} - -.featured-blog-image-holder { - background-color: transparent !important; - background-blend-mode: multiply; -} - -.featured-blog-image-holder::before { - background-color: black !important; - opacity: 0.7; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - display: block; - content: ""; -} - -.blog-pagination { - display: block; - margin-left: auto; - margin-right: auto; - width: auto; - text-align: center; -} - -.blog-post-image { - background-size: cover; - background-repeat: no-repeat; - height: 300px; -} - -@media all and (max-width: 1023px) { - .nav-1 .logo { - max-height: 60px; - max-width: 100%; - margin-right: 64px; - margin-top: 10px; - } - - .nav-1:hover { - background: rgba(30, 30, 30, 0.9); - } -} - -@media (max-width: 768px) { - .left-align-mobile { - text-align: left; - } - - .mobile-grid { - width: 50%; - margin-left: 22vw; - } - - .home-hero { - padding-left: 20px; - } - - .events-section { - padding-left: 0px; - } -} - -@media (max-width: 640px) { - .mobile-grid { - width: 70%; - margin-left: 15vw; - } -} - -@media (max-width: 400px) { - .mobile-grid { - width: 100%; - margin-left: 0vw; - } -} - -@media all and (max-width: 992px) and (min-width: 450px) { - .officers { - width: 50% !important; - float: left; - } -} - -.nav-1 ul li a { - padding: 40px 16px; -} - -.has-dropdown:before { - top: 40px; -} - -.nav-1 .social-links a { - padding: 20px 0px; -} - -.nav-1 { - background: rgba(0, 0, 0, 0); - position: absolute; -} - -.contrast-white-p { - color: #fff !important; - opacity: 0.6; -} -.contrast-white div{ - color: #fff !important; - opacity: 0.8; -} -.contrast-white strong { - color: #fff !important; - opacity: 1.0; -} -.contrast-white-detail{ - background: #fff !important; - opacity: 0.9; -} - -.job-desc a { - line-height: 32px; -} - -.col-md-6:nth-child(odd) { - clear: left; -} - -.col-md-3:nth-child(4n+1) { - clear: left; -} - -.zoom { - transition: .1s; -} - -.zoom:hover { - transform: scale(1.1); /* (150% zoom - Note: if the zoom is too large, it will go outside of the viewport) */ -} - -.dark-back { - background-color: #2f2f2f; -} - -.tables-h1 { - font-size: 36px; - font-weight: 300; - line-height: 0px; - color: #ffffff; -} - -.sch-box { - background-color: #151515; - border-radius: 25px; - border: 2px solid #999999; - width:30%; - height:170px; - font-size: 2.5vw; - line-height: 7vh; -} - -.flex-sch-container { - display: flex; - flex-direction: row; - margin-left: 60px; - margin-right: 60px; - margin-top: 50px; - align-items: top; - justify-content: space-around; -} - -@media (max-width: 550px){ - .sch-box { - width:100%; - font-size: 5.75vw; - line-height: 8vh; - } - .flex-sch-container{ - flex-direction: column; - } -} - -.events-box { - width: 100%; - float: right; - border: 0px; - margin-top: 10px; -} - -.sch-table{ - width:100%; - margin-left:5px; -} - -.fri-box { - height: 43vh; -} - -.sat-box { - height: 64vh; -} - -.sun-box { - height: 50vh; -} - -.sch-head { - color: #d1ce20; - font-size: 4.5 vw; - text-align: center; - line-height: 7vh; -} - -.event-div { - color: #d1ce20; - font-weight: 400; - font-family: 'Handjet', cursive; - font-weight: normal; - font-style: normal; - border-radius: 25px; - border: none; - margin-left: 3px; - margin-right: 3px; -} - -.sch-orange { - color: #ca5400; - display: inline; - float: right; - text-align:right; - margin-right: 5px; -} - From 3a3befa6b914e7d9f7a246109db9437fb93d20f2 Mon Sep 17 00:00:00 2001 From: MichaelDHellman <113139851+MichaelDHellman@users.noreply.github.com> Date: Tue, 26 Mar 2024 01:25:52 -0500 Subject: [PATCH 4/4] updated olympics.html link --- olympics.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/olympics.html b/olympics.html index 7fe7bd3..d1fb003 100644 --- a/olympics.html +++ b/olympics.html @@ -300,11 +300,11 @@

Join ACM Olympics - as a participant. Or, - as a volunteer.