From ff93a2c57734fc04bcf3895014fd7d52a86dd761 Mon Sep 17 00:00:00 2001 From: MattyTheHacker <18513864+MattyTheHacker@users.noreply.github.com> Date: Sun, 31 Jul 2022 19:24:57 +0100 Subject: [PATCH 1/5] Cleanup js --- js/calendar.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/js/calendar.js b/js/calendar.js index 30edaf24..a784f0f3 100644 --- a/js/calendar.js +++ b/js/calendar.js @@ -38,7 +38,7 @@ document.addEventListener('DOMContentLoaded', () => { googleCalendarId: CALENDAR_ID }, eventColor: '#9d68dc', - eventClick: function(event) { + eventClick: function (event) { loadEvent(event); } }); @@ -178,13 +178,15 @@ function loadEvent(event) { let eventFacebookLinkElement = document.getElementById("facebook-link"); let link = parseFacebookLink(eventDataExtended.description); if (link) { - eventFacebookLinkElement.onclick = () => {window.open(link)}; + eventFacebookLinkElement.onclick = () => { + window.open(link) + }; eventFacebookLinkElement.style.display = "inline"; } else { // catches null regex matches eventFacebookLinkElement.style.display = "none"; } - + // set text document.getElementById("event-text-title").textContent = title; document.getElementById("event-text-date").textContent = date; @@ -193,13 +195,12 @@ function loadEvent(event) { for (let line in description) { descStr += description[line].toString() + "\r\n"; } - document.getElementById("event-text-description").textContent = descStr; + document.getElementById("event-text-description").textContent = descStr; document.getElementById('calendar-event').style.display = "block"; //show } else { //null event console.error("Event is null"); } - } function hideEvent() { @@ -229,7 +230,6 @@ function parseDescription(description) { } else { return retDesc; } - } function parseFacebookLink(description) { @@ -249,6 +249,6 @@ function parseFacebookLink(description) { match = regexA.exec(retLink); if (match != null) { retLink = match[1]; - } + } return retLink; } \ No newline at end of file From 023493976834eea56d141280b6cbb5087c3821ed Mon Sep 17 00:00:00 2001 From: MattyTheHacker <18513864+MattyTheHacker@users.noreply.github.com> Date: Sun, 31 Jul 2022 19:53:10 +0100 Subject: [PATCH 2/5] Cleanup css --- css/about.scss | 45 ++++++++++++----------- css/ball/main.scss | 76 +++++++++++++++++++++++---------------- css/committee.scss | 6 ++-- css/hackathon-events.scss | 8 ++--- css/main.scss | 23 +++++------- css/normalize.css | 29 +++++---------- css/posts.scss | 14 ++++---- css/type.scss | 23 ++++++++++++ 8 files changed, 122 insertions(+), 102 deletions(-) diff --git a/css/about.scss b/css/about.scss index 855daa6e..2c76912b 100644 --- a/css/about.scss +++ b/css/about.scss @@ -6,7 +6,6 @@ h1, h2, h3, h4 { margin: 0; } - #about { font-size: 18px; } @@ -59,7 +58,7 @@ h1, h2, h3, h4 { } #discord-button { - background-color: #738ADB; + background-color: #738adb; color: white; i { color: white; @@ -75,7 +74,7 @@ h1, h2, h3, h4 { } #about-us { - background-color: #F1F3F8; + background-color: #f1f3f8; border-radius: 10px; padding: 20px; font-size: 18px; @@ -92,7 +91,7 @@ h1, h2, h3, h4 { grid-template-columns: repeat(3, 230px); } - @media (max-width: 1000px){ + @media (max-width: 1000px) { #guild-and-uob-images { justify-content: center; align-items: center; @@ -107,7 +106,7 @@ h1, h2, h3, h4 { } #social { - #social-buttons{ + #social-buttons { justify-content: center; display: grid; grid-template-columns: repeat(3, 185px); @@ -120,7 +119,7 @@ h1, h2, h3, h4 { text-decoration: none; text-align: center; font-size: 20px; - background-color: #F1F3F8; + background-color: #f1f3f8; border-radius: 20px; padding: 15px; margin-right: 10px; @@ -134,16 +133,16 @@ h1, h2, h3, h4 { } } - @media (max-width: 600px){ - #social-buttons{ + @media (max-width: 600px) { + #social-buttons { justify-content: center; display: grid; grid-template-columns: repeat(2, 185px); } } - @media (max-width: 400px){ - #social-buttons{ + @media (max-width: 400px) { + #social-buttons { justify-content: center; display: grid; grid-template-columns: 185px; @@ -151,7 +150,7 @@ h1, h2, h3, h4 { } .facebook { - background-color: #1877F2; + background-color: #1877f2; } .insta { @@ -159,20 +158,20 @@ h1, h2, h3, h4 { } .twitter { - background-color: #00A1F3; + background-color: #00a1f3; } .linkedin { - background-color: #0077B5; + background-color: #0077b5; } .youtube { - background-color: #EA3223; - } - + background-color: #ea3223; + } + .github { - background-color: #161B22; - } + background-color: #161b22; + } } #sponsors { @@ -187,7 +186,7 @@ h1, h2, h3, h4 { justify-content: center; display: grid; } - + .sponsors-link { display: inline-block; width: 280px; @@ -208,8 +207,8 @@ h1, h2, h3, h4 { } } - @media (max-width: 400px){ - #sponsors-images{ + @media (max-width: 400px) { + #sponsors-images { justify-content: center; align-items: center; display: grid; @@ -255,8 +254,8 @@ h1, h2, h3, h4 { } } - @media (max-width: 400px){ - #constitution-buttons{ + @media (max-width: 400px) { + #constitution-buttons { justify-content: center; display: grid; grid-template-columns: 185px; diff --git a/css/ball/main.scss b/css/ball/main.scss index 1871109f..6a95e8b4 100644 --- a/css/ball/main.scss +++ b/css/ball/main.scss @@ -1,8 +1,8 @@ --- --- -@import url('https://fontlibrary.org//face/cmu-serif'); -@import url('https://fonts.googleapis.com/css2?family=Gentium+Book+Basic:wght@700&family=Ovo&display=swap'); +@import url("https://fontlibrary.org//face/cmu-serif"); +@import url("https://fonts.googleapis.com/css2?family=Gentium+Book+Basic:wght@700&family=Ovo&display=swap"); $primary-background: #241040; $primary-lowlight: #0c0515; @@ -17,9 +17,8 @@ $text: #fff; $font-primary: "Gentium Book Basic", "CMUSerifRoman", serif; $font-secondary: "Ovo", serif; - html { - a { + a { color: $secondary-highlight; font-family: $font-secondary; text-decoration: none; @@ -28,19 +27,16 @@ html { header { background-color: $secondary-lowlight; - } body { width: 100%; min-height: 100vh; margin: 0; - background-image: url("/assets/events/ball/2022-background.png"); background-size: cover; background-attachment: fixed; background-color: $primary-background; - display: flex; flex-direction: column; @@ -59,7 +55,7 @@ body { margin-top: 10px; padding-top: 10px; } - + .margin-bottom { border-bottom: 3px solid $secondary-background; margin-bottom: 10px; @@ -88,7 +84,7 @@ body { font-family: $font-secondary; text-shadow: 1px 1px 2px $primary-lowlight; } - + .text-block { margin-top: 1.25vh; margin-bottom: 1.25vh; @@ -109,9 +105,11 @@ body { margin: 5px 5px; background-color: $secondary-lowlight; color: $text; + &.empty { filter: brightness(60%); } + &:not(.empty) { box-shadow: 2px 2px 3px $primary-lowlight; &:hover { @@ -122,36 +120,42 @@ body { } .flex { - display: flex; - flex-direction: row; + display: flex; + flex-direction: row; + + .flex-l { + flex: 0 1 auto; + } - .flex-l { - flex: 0 1 auto; - } - .flex-r { - flex: 1 0 auto; - } - } + .flex-r { + flex: 1 0 auto; + } + } .section-details { - .venue-date{ + .venue-date { font-size: 6vw; font-weight: bold; } - .countdown{ + + .countdown { font-size: 4vw; } - .subsubtitle{ + + .subsubtitle { margin: 5vh 1vw; } + @media screen and (max-width: 800px) { .title { font-size: 20vw; } - .venue-date{ + + .venue-date { font-size: 69px; } - .countdown{ + + .countdown { font-size: xx-large; } } @@ -164,6 +168,7 @@ body { .mobile-only { display: none; } + .description { position: absolute; top: 0; @@ -174,10 +179,12 @@ body { padding: 0 50px 0 20px; margin: 10px 0; max-height: 500px; + .subtitle { margin: 10px 0; } } + .image { object-fit: cover; object-position: 50% 25%; @@ -185,16 +192,19 @@ body { height: 60vh; max-height: 500px; } - @media screen and (max-width: 800px){ + + @media screen and (max-width: 800px) { .mobile-only { display: revert; } + .description { position: static; width: revert; height: revert; background: revert; padding: revert; + .subtitle { display: none; } @@ -207,19 +217,20 @@ body { font-size: 130px; margin: auto; } + .hashtag-buttons { display: inline-grid; margin: 0 auto; - flex: 0 0 auto + flex: 0 0 auto; } - - @media screen and (max-width: 1114px){ + @media screen and (max-width: 1114px) { flex-direction: column; .hashtag { font-size: 16vw; } + .hashtag-buttons { display: block; } @@ -233,6 +244,7 @@ body { .mobile-only { display: none; } + .description { position: absolute; top: 0; @@ -243,10 +255,12 @@ body { padding: 0 20px 0 50px; margin: 10px 0; max-height: 500px; + .subtitle { margin: 10px 0; } } + .image { object-fit: cover; object-position: 50% 30%; @@ -254,16 +268,19 @@ body { height: 60vh; max-height: 500px; } - @media screen and (max-width: 800px){ + + @media screen and (max-width: 800px) { .mobile-only { display: revert; } + .description { position: static; width: revert; height: revert; background: revert; padding: revert; + .subtitle { display: none; } @@ -274,7 +291,6 @@ body { .section-faq { .faq { border-top: 2px solid rgba(255, 255, 255, 0.3); - padding-top: 5px; margin: auto; width: 70%; @@ -299,7 +315,7 @@ body { margin: auto; width: 80%; } - + .menu-item { font-family: $font-secondary; margin-bottom: 2.5vh; diff --git a/css/committee.scss b/css/committee.scss index faa43bd6..9be94bf5 100644 --- a/css/committee.scss +++ b/css/committee.scss @@ -28,7 +28,7 @@ width: 150px; height: 100%; object-fit: cover; - flex: 0 0 auto; + flex: 0 0 auto; border-right: 1px solid #222; } @@ -74,7 +74,7 @@ } } -@media only screen and (max-width : 800px) { +@media only screen and (max-width: 800px) { .person { flex-direction: column; @@ -88,7 +88,7 @@ } } -@media only screen and (max-width : 1500px) { +@media only screen and (max-width: 1500px) { .person-container { grid-template-columns: 1fr; } diff --git a/css/hackathon-events.scss b/css/hackathon-events.scss index 366aa8e5..2eb621f4 100644 --- a/css/hackathon-events.scss +++ b/css/hackathon-events.scss @@ -39,14 +39,14 @@ html { display: table; } - .name { font-size: large; } -.date { +.date { font-size: small; } + .name, .date { color: black; text-align: center; @@ -58,12 +58,12 @@ html { display: inline-block; padding: 8px; color: white; - background-color: #2E3C62; + background-color: #2e3c62; text-align: center; cursor: pointer; width: 100%; } .button:hover { - background-color: #25304F; + background-color: #25304f; } \ No newline at end of file diff --git a/css/main.scss b/css/main.scss index e8d1fae5..87e4868c 100644 --- a/css/main.scss +++ b/css/main.scss @@ -1,17 +1,17 @@ --- --- -@import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,300;0,500;0,700;1,100&family=Roboto&display=swap'); +@import url("https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,300;0,500;0,700;1,100&family=Roboto&display=swap"); @font-face { font-family: "Inconsolata"; src: url(/fonts/Inconsolata-Regular.ttf) format("truetype"); } -$CSS-Blue: #2f3c63; -$CSS-Mid-Blue: #101939; +$CSS-Blue: #2f3c63; +$CSS-Mid-Blue: #101939; $CSS-Deep-Blue: #0a0f1e; -$TeX-Purple: #9d68dc; +$TeX-Purple: #9d68dc; body { width: 100%; @@ -25,7 +25,7 @@ body { #freshers-banner { display: none; - background-color: #9D68DC; + background-color: #9d68dc; border-radius: 10px; padding: 2px 20px; font-size: 18px; @@ -122,7 +122,7 @@ main { margin-left: auto; margin-right: auto; } - + img { display: block; width: 100%; @@ -163,18 +163,18 @@ header { .nav { // neat animations &:before, &:after { - content: ''; + content: ""; width: 0; height: 0; display: block; background-color: white; - transition: width 0.2s; } &:before { float: left; } + &:after { float: right; } @@ -219,15 +219,11 @@ header { opacity: 0; display: flex; visibility: hidden; - padding-top: 100px; - background-color: $CSS-Deep-Blue; z-index: 1000; - flex-direction: column; align-items: flex-end; - transition: opacity 0.2s; &.visible { @@ -239,7 +235,6 @@ header { text-align: right; font-size: 2em; line-height: 1.6em; - margin-right: 20px; a { @@ -294,7 +289,7 @@ header { .right { display: none; } - + .hamburger { display: inline-block; } diff --git a/css/normalize.css b/css/normalize.css index 8b431fbb..99f7a356 100644 --- a/css/normalize.css +++ b/css/normalize.css @@ -1,6 +1,4 @@ ---- ---- - +--- --- /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ /* Document @@ -96,8 +94,7 @@ abbr[title] { * Add the correct font weight in Chrome, Edge, and Safari. */ -b, -strong { +b, strong { font-weight: bolder; } @@ -106,9 +103,7 @@ strong { * 2. Correct the odd `em` font sizing in all browsers. */ -code, -kbd, -samp { +code, kbd, samp { font-family: monospace, monospace; /* 1 */ font-size: 1em; /* 2 */ } @@ -126,8 +121,7 @@ small { * all browsers. */ -sub, -sup { +sub, sup { font-size: 75%; line-height: 0; position: relative; @@ -161,11 +155,7 @@ img { * 2. Remove the margin in Firefox and Safari. */ -button, -input, -optgroup, -select, -textarea { +button, input, optgroup, select, textarea { font-family: inherit; /* 1 */ font-size: 100%; /* 1 */ line-height: 1.15; /* 1 */ @@ -177,8 +167,7 @@ textarea { * 1. Show the overflow in Edge. */ -button, -input { /* 1 */ +button, input { /* 1 */ overflow: visible; } @@ -187,8 +176,7 @@ input { /* 1 */ * 1. Remove the inheritance of text transform in Firefox. */ -button, -select { /* 1 */ +button, select { /* 1 */ text-transform: none; } @@ -271,8 +259,7 @@ textarea { * 2. Remove the padding in IE 10. */ -[type="checkbox"], -[type="radio"] { +[type="checkbox"], [type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ } diff --git a/css/posts.scss b/css/posts.scss index 45c4399e..b17a3a46 100644 --- a/css/posts.scss +++ b/css/posts.scss @@ -128,20 +128,17 @@ $preview-height: 150px; flex: 0 0 auto; object-fit: cover; } + .post-quote-title { margin-top: 0.5em; margin-bottom: 0.5em; } + .post-quote-subtitle { margin-top: 0.5em; margin-bottom: 0.5em; - - } - .post-quote-excerpt { - } } - } .post-header { @@ -173,16 +170,17 @@ $preview-height: 150px; margin-top: 0.5em; margin-bottom: 0.3em; } + .post-date { margin-top: 0.3em; margin-bottom: 0.5em; } + .post-excerpt p { margin-top: 0.5em; } } } - } @media only screen and (max-width: 600px) { @@ -192,13 +190,15 @@ $preview-height: 150px; margin-top: 0.2em; margin-bottom: 0.2em; } + .post-date { margin-top: 0.2em; margin-bottom: 0.2em; } + .post-excerpt p { margin-top: 0.5em; } } } -} +} \ No newline at end of file diff --git a/css/type.scss b/css/type.scss index 7ac3c1dc..b6ee28cc 100644 --- a/css/type.scss +++ b/css/type.scss @@ -51,6 +51,7 @@ pre.ascii { &[c="}"] { color: #58cad6; } + &[c="0"], &[c="1"], &[c="2"], @@ -90,67 +91,88 @@ pre.ascii { &.d1 { animation-delay: 0.5s; } + &.d2 { animation-delay: 0.7s; } + &.d3 { animation-delay: 0.9s; } + &.d4 { animation-delay: 1.1s; } + &.d5 { animation-delay: 1.3s; } + &.d6 { animation-delay: 1.5s; } + &.d7 { animation-delay: 1.7s; } + &.d8 { animation-delay: 1.9s; } + &.d9 { animation-delay: 2.1s; } + &.d10 { animation-delay: 2.3s; } + &.d11 { animation-delay: 2.5s; } + &.d12 { animation-delay: 2.7s; } + &.d13 { animation-delay: 2.9s; } + &.d14 { animation-delay: 3.1s; } + &.d15 { animation-delay: 3.3s; } + &.d16 { animation-delay: 3.5s; } + &.d17 { animation-delay: 3.7s; } + &.d18 { animation-delay: 3.9s; } + &.d19 { animation-delay: 4.1s; } + &.d20 { animation-delay: 4.3s; } + &.d21 { animation-delay: 4.5s; } } + abbr[title] .delay { line-height: 1; } @@ -160,6 +182,7 @@ pre.ascii { from { width: 0; } + to { width: 100%; } From 13f0ca80262ccf78609def21ef7012775a0e63bf Mon Sep 17 00:00:00 2001 From: MattyTheHacker <18513864+MattyTheHacker@users.noreply.github.com> Date: Sun, 31 Jul 2022 20:55:38 +0100 Subject: [PATCH 3/5] Cleanup yaml --- _data/ball/2022.yaml | 10 +++++----- _data/committee/2020-21.yaml | 26 ++++++++++++-------------- _data/committee/2021-22.yaml | 12 +++++------- _data/committee/2022-23.yaml | 4 ++-- _data/redirects.yaml | 6 +++--- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/_data/ball/2022.yaml b/_data/ball/2022.yaml index 2bdc627e..a33f9eab 100644 --- a/_data/ball/2022.yaml +++ b/_data/ball/2022.yaml @@ -2,13 +2,13 @@ name: CSS BALL year: 2022 location: Fazeley Studios date: 27th April -links: +links: - text: Menu - url: '\ball\2022\menu' + url: '\ball\2022\menu' - text: Venue - url: '#Venue' + url: "#Venue" - text: FAQs - url: '#FAQ' + url: "#FAQ" - text: Photos url: '\ball\2022\photos' menu: @@ -38,7 +38,7 @@ faq: - question: Could I bring a guest? answer: Yes, though they needed a guest ticket to attend. - question: Will I need to show my ticket when I arrive? - answer: No, we'll have a list of everyone who has bought a ticket so you'll just need to give your name and head right in. + answer: No, we'll have a list of everyone who has bought a ticket so you'll just need to give your name and head right in. - question: Who will I sit next to? answer: We'll ask you for the names of up to 2 people who you would like to sit near. We'll try our best to sit people near their friends, but we can't make promises you'll be next to both.

If you bring a Guest we will make sure you're sat with them, but please be sure to put them in as your seating preference. - question: What about my dietary requirements? diff --git a/_data/committee/2020-21.yaml b/_data/committee/2020-21.yaml index cab35d0a..5d111ac9 100644 --- a/_data/committee/2020-21.yaml +++ b/_data/committee/2020-21.yaml @@ -11,22 +11,23 @@ people: out over responsibilities and deadlines, I spend a lot of my time playing RPGs and drinking iced lemon tea. picture: /assets/committee/2020-21/mini/jacqui.jpg + - name: Tom Goodman role: Secretary bio: > Hey! I'm a 3rd year PhD student in the School πŸ’– This year, I'm serving as your Secretary, and have been on the committee for five (😱) years now. I love cats, baking, gin, board games, and a boatload of other stuff - feel free to come and have a chat. - picture: /assets/committee/2020-21/mini/tom.jpg + - name: Jake Foster role: Treasurer bio: > Hi I’m Jake and this academic year I will be managing the societies finances. I am going into my 4th year and plan to spend it playing DnD, drinking, and completing the occasional assignment. I look forward to a year full of interesting events hosted by this society. - picture: /assets/committee/2020-21/mini/jake.jpg + - name: Valeria Popescu role: Vice-President bio: > @@ -35,9 +36,8 @@ people: I love organising events and networking. I am always looking for personal development and career opportunities, so if you are keen on talking about internships, CVs or interview prepping, I would love to help you! - - picture: /assets/committee/2020-21/mini/valeria.jpg + - name: Robert Hallam role: Socials Rep bio: > @@ -46,14 +46,15 @@ people: the unlikely event that you can’t find me in the Sloman lounge or in the labs, I’m probably either playing guitar or running along the canals. picture: /assets/committee/2020-21/mini/rob.png + - name: Afarin Izadi role: International Student Rep bio: > I know all about the struggles of being an international student β€” like finding friends, understanding the culture, and homesickness. I'm here to help you make friends and to make everyone feel like they belong in our community. In my free time, I love sports, fashion design and talking about Elon Musk! - picture: /assets/committee/2020-21/mini/afarin.jpg + - name: Jacob Wilson role: Special Events Rep bio: > @@ -61,9 +62,8 @@ people: smoothly and that everyone has a good time. I hope to make all of our events special throughout the year! In my spare time, I drink wine and fence as part of the University's fencing team (sometimes concurrently). - - picture: /assets/committee/2020-21/mini/jacob.jpg + - name: Leela Muppala role: Diversity, Equality and Inclusivity Rep bio: > @@ -72,22 +72,23 @@ people: making sure we offer a diverse set of activities for our whole community. Aside from this, I mostly waste time by watching horror movies and reading murder mysteries. Feel free to contact me with any suggestions or concerns! - picture: /assets/committee/2020-21/mini/leela.jpg + - name: Daniel Stoica role: Sports Rep bio: > I encourage everyone (regardless of your level or experience) to take part in our sports and e-sports events! One of my goals this year is to increase the amount of people involved in e-sports. When time allows, I love to go to the gym, read books and play video games. - picture: /assets/committee/2020-21/mini/daniel-stoica.jpg + - name: George Baker role: Publicity Rep bio: > I’m responsible for promoting all of our wonderful events and maintaining this website! In my spare time, I enjoy photography, playing tennis, and listening to music. picture: /assets/committee/2020-21/mini/george.jpeg + - name: Likkan Chung role: Industrial Rep bio: > @@ -95,19 +96,16 @@ people: As our Industrial Liaison, I bring industry and careers events to the society. Outside of CSS, I help organise events like HackTheMidlands and I'm also a student ambassador for the department. - - picture: /assets/committee/2020-21/mini/likkan.jpg + - name: Rhys Morgan role: First Year Rep bio: > Hello World! I'm Rhys, a first year degree apprentice and your First Year Rep. I enjoy anything to do with CS and many other things - from programming to cycling (sometimes I do both πŸ˜‰). I'll be making sure that you feel welcomed as a first year, and that CSS is a cool place for you. Feel free to contact me and I'll be sure to get back to you. πŸ˜‡ - - - picture: /assets/committee/2020-21/mini/rhys.jpg + - name: Dan Clark role: Post-Graduate (Research) Rep bio: > diff --git a/_data/committee/2021-22.yaml b/_data/committee/2021-22.yaml index 059df571..672380fd 100644 --- a/_data/committee/2021-22.yaml +++ b/_data/committee/2021-22.yaml @@ -83,10 +83,10 @@ people: end-date: 1/7/2022 picture: /assets/committee/2021-22/mini/gokul.png bio: > - Hey everyone! I’m Gokul, a CS student who is the First year representative for CSS this year. - My job is to ensure all first years enjoy their time at CSS and more generally at university. - I have many hobbies, including programming, recreational maths, puzzle solving and video games. - I'm always happy to help so always feel welcome to message me on Discord or approach me on campus! + Hey everyone! I’m Gokul, a CS student who is the First year representative for CSS this year. + My job is to ensure all first years enjoy their time at CSS and more generally at university. + I have many hobbies, including programming, recreational maths, puzzle solving and video games. + I'm always happy to help so always feel welcome to message me on Discord or approach me on campus! - name: Mohammed Aamaan pronouns: He/Him @@ -182,7 +182,7 @@ people: Hi! I'm Tori, I'm a first year doing Comp Sci/ Software Engineering MEng with an Industrial Year. As the EDI officer I'm in charge if making sure that everyone feels represented, equal and safe within CS. I'm also an ambassador for CS and love spending time with all the people here. - + - name: Lyndon Chan pronouns: He/Him discordtag: LyndonChan#5225 @@ -231,5 +231,3 @@ people: Bluetooth. Outside of that, I enjoy competing in CTF competitions and Rock Climbing. I was the CSS PGT rep during my MSc back in 2016/17, went to work for a few years then came back to UoB in 2019 and have been PGR rep ever since. - - diff --git a/_data/committee/2022-23.yaml b/_data/committee/2022-23.yaml index 9710a955..fb981821 100644 --- a/_data/committee/2022-23.yaml +++ b/_data/committee/2022-23.yaml @@ -9,7 +9,7 @@ people: picture: /assets/committee/2022-23/mini/jacob.jpg start-date: 1/7/2022 bio: > - Hello! I'm a final year Computer Science student and my role is to lead the society and manage the committee to help everything get done. πŸŽ‰ CSS members may recognise me from the many CSS quizzes I've written and hosted, all with a glass of wine in my hand 🍷 In my spare time I like to play D&D, win at board games, and travel. I've been on the committee for three years now and I've met my best friends through CSS, feel free to reach out on the Discord or say hi in person <3 + Hello! I'm a final year Computer Science student and my role is to lead the society and manage the committee to help everything get done. πŸŽ‰ CSS members may recognise me from the many CSS quizzes I've written and hosted, all with a glass of wine in my hand 🍷 In my spare time I like to play D&D, win at board games, and travel. I've been on the committee for three years now and I've met my best friends through CSS, feel free to reach out on the Discord or say hi in person <3 - name: Juozas Domarkas pronouns: He/Him @@ -79,7 +79,7 @@ people: bio: > Hi! I'm Leonardo, a second year studying Computer Science. I'm responsible for organising large scale CSS events, such as the BBQ, Christmas meal, Ball and helping with other events. Outside of CSS, I enjoy robotics, cybersecurity, - gaming, and Formula 1. 🏎 + gaming, and Formula 1. 🏎 - name: Leaf pronouns: He/Sprout/They diff --git a/_data/redirects.yaml b/_data/redirects.yaml index a8725ef9..569594c2 100644 --- a/_data/redirects.yaml +++ b/_data/redirects.yaml @@ -73,7 +73,7 @@ destination: https://github.com/CSSUoB/GDSCGit - source: /git/workshop destination: https://learngitbranching.js.org - + # Calendar Typos - source: /calender destination: /calendar @@ -83,11 +83,11 @@ destination: /assets/agendas/agenda_22_05_04.pdf - source: /feedback destination: https://docs.google.com/forms/d/e/1FAIpQLScTIizptSk8feTUWRGzKYEJ9_odGQh8Irv8GBAHALDJArzgeg/viewform?usp=sf_link - + # Bletchley Park - source: /bletchley-park destination: https://www.guildofstudents.com/events/6531/6398/ # BBQ - source: /bbq - destination: https://www.eventbrite.co.uk/e/css-bbq-2022-tickets-343681248867 \ No newline at end of file + destination: https://www.eventbrite.co.uk/e/css-bbq-2022-tickets-343681248867 From 35cf49884b426b529ee98fd5cc7a4dc7248f4653 Mon Sep 17 00:00:00 2001 From: MattyTheHacker <18513864+MattyTheHacker@users.noreply.github.com> Date: Sun, 31 Jul 2022 20:57:19 +0100 Subject: [PATCH 4/5] Cleanup redirects --- _data/redirects.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/_data/redirects.yaml b/_data/redirects.yaml index 569594c2..3912b039 100644 --- a/_data/redirects.yaml +++ b/_data/redirects.yaml @@ -51,8 +51,6 @@ # ball - source: /ball destination: /ball/2022 -- source: /soon - destination: /ball/2022 - source: /ball/2022/photos destination: https://photos.app.goo.gl/bSyPR6fyHGtGDW6h9 @@ -83,11 +81,3 @@ destination: /assets/agendas/agenda_22_05_04.pdf - source: /feedback destination: https://docs.google.com/forms/d/e/1FAIpQLScTIizptSk8feTUWRGzKYEJ9_odGQh8Irv8GBAHALDJArzgeg/viewform?usp=sf_link - -# Bletchley Park -- source: /bletchley-park - destination: https://www.guildofstudents.com/events/6531/6398/ - -# BBQ -- source: /bbq - destination: https://www.eventbrite.co.uk/e/css-bbq-2022-tickets-343681248867 From b333b56ea17f043c1c62994c9df29c94930826f7 Mon Sep 17 00:00:00 2001 From: MattyTheHacker <18513864+MattyTheHacker@users.noreply.github.com> Date: Sun, 31 Jul 2022 22:26:33 +0100 Subject: [PATCH 5/5] Convert hex to uppercase --- css/about.scss | 36 +++++++++++++++++++++++------------- css/ball/main.scss | 14 +++++++------- css/calendar.scss | 6 +++--- css/clubs.scss | 8 ++++---- css/committee.scss | 4 ++-- css/hackathon-events.scss | 4 ++-- css/main.scss | 10 +++++----- css/normalize.css | 2 +- css/posts.scss | 2 +- css/type.scss | 10 +++++----- js/calendar.js | 2 +- 11 files changed, 54 insertions(+), 44 deletions(-) diff --git a/css/about.scss b/css/about.scss index 2c76912b..bfcb1908 100644 --- a/css/about.scss +++ b/css/about.scss @@ -34,9 +34,11 @@ h1, h2, h3, h4 { #about-profile { margin: 20px 0; + h1 { margin: 10px 0; } + .button { display: inline-block; padding: 15px; @@ -58,23 +60,25 @@ h1, h2, h3, h4 { } #discord-button { - background-color: #738adb; + background-color: #738ADB; color: white; + i { color: white; } } #guild-button { - background-color: #5bbaa2; + background-color: #5BBAA2; color: white; + img { vertical-align: middle; } } #about-us { - background-color: #f1f3f8; + background-color: #F1F3F8; border-radius: 10px; padding: 20px; font-size: 18px; @@ -119,15 +123,17 @@ h1, h2, h3, h4 { text-decoration: none; text-align: center; font-size: 20px; - background-color: #f1f3f8; + background-color: #F1F3F8; border-radius: 20px; padding: 15px; margin-right: 10px; margin-bottom: 10px; + h4 { font-family: "Helvetica Neue", sans-serif; margin: 0; } + h4, i { color: white; } @@ -150,27 +156,27 @@ h1, h2, h3, h4 { } .facebook { - background-color: #1877f2; + background-color: #1877F2; } .insta { - background-color: #d13378; + background-color: #D13378; } .twitter { - background-color: #00a1f3; + background-color: #00A1F3; } .linkedin { - background-color: #0077b5; + background-color: #0077B5; } .youtube { - background-color: #ea3223; + background-color: #EA3223; } .github { - background-color: #161b22; + background-color: #161B22; } } @@ -198,10 +204,12 @@ h1, h2, h3, h4 { border-radius: 20px; padding: 15px; margin-bottom: 10px; + h4 { font-family: "Helvetica Neue", sans-serif; margin: 0; } + h4, i { color: white; } @@ -222,7 +230,7 @@ h1, h2, h3, h4 { } .proposal { - background-color: #4a9efe; //TeX Detail Shadow + background-color: #4A9EFE; //TeX Detail Shadow } } @@ -245,10 +253,12 @@ h1, h2, h3, h4 { padding: 15px; margin-bottom: 10px; margin-right: 10px; + h4 { font-family: "Helvetica Neue", sans-serif; margin: 0; } + h4, i { color: white; } @@ -263,11 +273,11 @@ h1, h2, h3, h4 { } .constitution { - background-color: #793fd8; //TeX Shadow + background-color: #793FD8; //TeX Shadow } .agendas { - background-color: #3b37b6; //TeX Blue + background-color: #3B37B6; //TeX Blue } } diff --git a/css/ball/main.scss b/css/ball/main.scss index 6a95e8b4..e9813680 100644 --- a/css/ball/main.scss +++ b/css/ball/main.scss @@ -5,14 +5,14 @@ @import url("https://fonts.googleapis.com/css2?family=Gentium+Book+Basic:wght@700&family=Ovo&display=swap"); $primary-background: #241040; -$primary-lowlight: #0c0515; +$primary-lowlight: #0C0515; -$secondary-highlight: #e4d05f; -$secondary-background: #cbb347; -$secondary-lowlight: #79651b; +$secondary-highlight: #E4D05F; +$secondary-background: #CBB347; +$secondary-lowlight: #79651B; $secondary-text: #000; -$text: #fff; +$text: #FFF; $font-primary: "Gentium Book Basic", "CMUSerifRoman", serif; $font-secondary: "Ovo", serif; @@ -175,7 +175,7 @@ body { left: 0; width: 400px; height: 60vh; - background: linear-gradient(to left, #0000 0%, #0c0515d0 5%); + background: linear-gradient(to left, #0000 0%, #0C0515D0 5%); padding: 0 50px 0 20px; margin: 10px 0; max-height: 500px; @@ -251,7 +251,7 @@ body { right: 0; width: 400px; height: 60vh; - background: linear-gradient(to right, #0000 0%, #0c0515d0 5%); + background: linear-gradient(to right, #0000 0%, #0C0515D0 5%); padding: 0 20px 0 50px; margin: 10px 0; max-height: 500px; diff --git a/css/calendar.scss b/css/calendar.scss index 078ea90f..c007d4cd 100644 --- a/css/calendar.scss +++ b/css/calendar.scss @@ -1,10 +1,10 @@ --- --- -$CSS-Blue: #2f3c63; +$CSS-Blue: #2F3C63; $CSS-Mid-Blue: #101939; -$CSS-Deep-Blue: #0a0f1e; -$TeX-Purple: #9d68dc; +$CSS-Deep-Blue: #0A0F1E; +$TeX-Purple: #9D68DC; .calendar-controls { margin-left: auto; diff --git a/css/clubs.scss b/css/clubs.scss index 8ae456d2..d2cb6476 100644 --- a/css/clubs.scss +++ b/css/clubs.scss @@ -51,7 +51,7 @@ } a { - color: #9d68dc; + color: #9D68DC; } } @@ -61,7 +61,7 @@ } &.not-recent { - background-color: #fff; + background-color: #FFF; .header-image { height: 25vh; @@ -93,7 +93,7 @@ max-width: 35vw; - background: linear-gradient(to right, #0000 0%, #fffd 10%); + background: linear-gradient(to right, #0000 0%, #FFFD 10%); text-align: right; @@ -109,7 +109,7 @@ } .club.recent { - background-color: #fff; + background-color: #FFF; .details { padding-left: 30px; diff --git a/css/committee.scss b/css/committee.scss index 9be94bf5..35aa6526 100644 --- a/css/committee.scss +++ b/css/committee.scss @@ -14,7 +14,7 @@ opacity: 0; } - background-color: #fdfdfd; + background-color: #FDFDFD; overflow: hidden; border-radius: 10px; @@ -96,4 +96,4 @@ .person { max-width: 700px; } -} +} \ No newline at end of file diff --git a/css/hackathon-events.scss b/css/hackathon-events.scss index 2eb621f4..b209de0a 100644 --- a/css/hackathon-events.scss +++ b/css/hackathon-events.scss @@ -58,12 +58,12 @@ html { display: inline-block; padding: 8px; color: white; - background-color: #2e3c62; + background-color: #2E3C62; text-align: center; cursor: pointer; width: 100%; } .button:hover { - background-color: #25304f; + background-color: #25304F; } \ No newline at end of file diff --git a/css/main.scss b/css/main.scss index 87e4868c..4d8f67ce 100644 --- a/css/main.scss +++ b/css/main.scss @@ -8,10 +8,10 @@ src: url(/fonts/Inconsolata-Regular.ttf) format("truetype"); } -$CSS-Blue: #2f3c63; +$CSS-Blue: #2F3C63; $CSS-Mid-Blue: #101939; -$CSS-Deep-Blue: #0a0f1e; -$TeX-Purple: #9d68dc; +$CSS-Deep-Blue: #0A0F1E; +$TeX-Purple: #9D68DC; body { width: 100%; @@ -25,7 +25,7 @@ body { #freshers-banner { display: none; - background-color: #9d68dc; + background-color: #9D68DC; border-radius: 10px; padding: 2px 20px; font-size: 18px; @@ -309,5 +309,5 @@ footer { } hr { - color: #9d68dc; + color: #9D68DC; } \ No newline at end of file diff --git a/css/normalize.css b/css/normalize.css index 99f7a356..ce9cb871 100644 --- a/css/normalize.css +++ b/css/normalize.css @@ -76,7 +76,7 @@ pre { a { background-color: transparent; - color: #9d68dc; + color: #9D68DC; } /** diff --git a/css/posts.scss b/css/posts.scss index b17a3a46..1f20dc09 100644 --- a/css/posts.scss +++ b/css/posts.scss @@ -66,7 +66,7 @@ $preview-height: 150px; } a { - color: #9d68dc; + color: #9D68DC; } .post-title, .post-date { diff --git a/css/type.scss b/css/type.scss index b6ee28cc..f5eef83d 100644 --- a/css/type.scss +++ b/css/type.scss @@ -33,7 +33,7 @@ pre.ascii { &[c="_"], &[c="$"] { - color: #ff9c00; + color: #FF9C00; } &[c=";"], @@ -42,14 +42,14 @@ pre.ascii { &[c=")"], &[c="!"], &[c="="] { - color: #fff; + color: #FFF; } &[c="["], &[c="]"], &[c="{"], &[c="}"] { - color: #58cad6; + color: #58CAD6; } &[c="0"], @@ -62,11 +62,11 @@ pre.ascii { &[c="7"], &[c="8"], &[c="9"] { - color: #03e421; + color: #03E421; } &[c="comment"] { - color: #fdff8a; + color: #FDFF8A; * { color: inherit; } diff --git a/js/calendar.js b/js/calendar.js index a784f0f3..9babd629 100644 --- a/js/calendar.js +++ b/js/calendar.js @@ -37,7 +37,7 @@ document.addEventListener('DOMContentLoaded', () => { events: { googleCalendarId: CALENDAR_ID }, - eventColor: '#9d68dc', + eventColor: '#9D68DC', eventClick: function (event) { loadEvent(event); }