From 32761dfc6a9c3fd858ae0edec4ad27aaf125863c Mon Sep 17 00:00:00 2001 From: Joan Rios i Pla <104719628+JoanRiosiPla@users.noreply.github.com> Date: Fri, 15 Nov 2024 18:37:03 +0000 Subject: [PATCH 1/6] Cambiado estilo para que concuerde con los carteles/rollup (WIP) --- css/calendario.css | 19 ++- css/style.css | 307 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 254 insertions(+), 72 deletions(-) diff --git a/css/calendario.css b/css/calendario.css index dd3eda4..58209d7 100644 --- a/css/calendario.css +++ b/css/calendario.css @@ -1,14 +1,13 @@ :root { - --numDays: 5; - --numHours: 7; - --timeHeight: 60px; - --calBgColor: #EDEDED; - /* --eventBorderColor: #f2d3d8; */ - --eventColor1: #7abf9c; - --eventColor2: #a3c182; - --eventColor3: #70a0ae; - } - + --numDays: 5; + --numHours: 7; + --timeHeight: 60px; + --calBgColor: #EDEDED; + /* --eventBorderColor: #f2d3d8; */ + --eventColor1: var(--color3); + --eventColor2: var(--color2); + --eventColor3: var(--color1); +} .title-calendar { display: flex; flex-direction: column; diff --git a/css/style.css b/css/style.css index 611475d..e370619 100644 --- a/css/style.css +++ b/css/style.css @@ -1,12 +1,19 @@ +/* Mods by NAKKI (@nak.kiwi on insta)*/ +/* Original code from https://orchallenge.es */ + +@import url('https://fonts.googleapis.com/css2?family=Rubik+Mono+One&family=Rubik:ital,wght@0,300..900;1,300..900&display=swap'); + + :root { - --color1: #296bad; - --color2: #97C575; - --color3: #ffe600; - --fontColor1: #000000; - --fontColor2: #fefdfb; + --color1: #F9CC3E; + --color2: #FF6A00; + --color3: #f9ae3e; + --fontColor1: #000; + --fontColor2: #000; } -html, body { +html, +body { z-index: 0; } @@ -15,21 +22,35 @@ html, body { padding: 0; margin: 0; text-decoration: none; - font-family: "Poppins", sans-serif; - font-weight: 400; + font-family: "Rubik", sans-serif; + font-weight: 500; color: var(--fontColor1); } /* Nav */ - .logo { display: flex; align-items: center; + width: 63px; + height: 25px; + position: relative; } +/* TODO: disable hidden and add to page */ .logo-img { - width: 80px; /* Set the width */ + width: 80px; + /* Set the width */ height: auto; + display: none; +} +.logo::after { + content: ""; + background-image: url("https://utfs.io/f/8JQcvMcXxzFviKKjeT0AjvMNZXQoWlKx7SCkH6yw9IfVPUeB"); + background-size: cover; + width: 63px; + height: 45px; + position: relative; + top: 10px; } .nav { @@ -49,13 +70,13 @@ html, body { } #nav { - background: rgb(9,77,145); - background: linear-gradient(36deg, #094d91 0%, rgba(146,189,87,0.6) 100%); + background: var(--color1); + background: linear-gradient(36deg, var(--color1) 0%, var(--color2) 100%); } .nav-scrolled { - background: rgb(9,77,145); - background: linear-gradient(36deg, #094d91 0%, rgba(146,189,87,0.6) 100%); + background: var(--color1); + background: linear-gradient(36deg, var(--color1) 0%, var(--color2) 100%); } .nav-links { @@ -70,7 +91,10 @@ html, body { } .nav-links a { + box-sizing: border-box; + border: 2px solid transparent; cursor: pointer; + display: inline-block; font-size: 16px; border-radius: 20px; padding: 5px 13px; @@ -82,11 +106,12 @@ html, body { } .nav-button:hover { - background-color: #cecece52; + border: 2px solid black; + background-color: #ff6a00; } .form-button { - border: 1.5px solid var(--fontColor2); + border: 3px solid var(--fontColor2); color: var(--fontColor2); } @@ -105,7 +130,6 @@ html, body { } /* Small Screen */ - @media screen and (max-width: 650px) { .nav-links { @@ -136,17 +160,17 @@ html, body { .nav-button:hover { background-color: #cecece52; } - + .form-button { background-color: var(--color1); color: var(--fontColor2); } - + .form-button:hover { background-color: #51a5d5; color: var(--fontColor2); } - + .open { right: 0%; @@ -163,8 +187,19 @@ html, body { height: 100vh; width: 100%; z-index: 1; - background: rgb(9,77,145); - background: linear-gradient(36deg, #094d91 0%, rgba(146,189,87,1) 100%); + background: var(--color1); + background: linear-gradient(36deg, var(--color1) 0%, var(--color1) 100%); + /*TODO: change/delete gradient*/ +} + +.header::after { + content: ""; + background-image: url(https://utfs.io/f/8JQcvMcXxzFvsin6xMcEngCsPXAV9DLif7aEpQoByq6zluTJ); + background-size: cover; + height: 100%; + width: 100%; + position: absolute; + mix-blend-mode: overlay; } .header-body { @@ -173,26 +208,40 @@ html, body { position: absolute; top: 43%; left: 50%; - transform: translate(-50%,-40%); + transform: translate(-50%, -40%); display: flex; flex-direction: row; } +.header-body::after { + content: ""; + background-image: url("https://utfs.io/f/8JQcvMcXxzFvwxSMY86pxvP2imLB8yJMNaFe3tqjUVX0rYAO"); + position: absolute; + top: 120px; + left: 720px; + width: 500px; + height: 300px; + background-size: cover; +} + .titles { top: 40%; left: 0%; - transform: translate(0%,20%); + transform: translate(0%, 20%); text-align: left; } .titles h1 { - font-weight: 500; font-size: 101px; color: var(--fontColor2); + + font-family: "Rubik Mono One", monospace; + font-weight: 800; + font-style: normal; } .titles p { - font-weight: 200; + font-weight: 500; font-size: 20px; margin-bottom: 25px; color: var(--fontColor2); @@ -203,13 +252,16 @@ html, body { } /* Second section */ - .second-section { /* min-height: 100vh; */ margin: 10px; + padding: 7% 0 0 0; + + /* Center content */ + display: flex; + flex-direction: column; align-items: center; justify-content: center; - padding: 7% 0 0 0; } .second-section h2 { @@ -225,7 +277,16 @@ html, body { padding: 0 7% 0 7%; } -.second-section h2, .second-section p { +* > h2, .intro > h1 { + color: var(--fontColor1) !important; + text-align: center !important; + font-family: "Rubik Mono One" !important; + text-shadow: 0px 4px 0px var(--color1) !important; + +} +/*Todo: remove other h2 styles*/ + +.second-section p { text-align: center; } @@ -233,16 +294,18 @@ html, body { display: flex; flex-direction: row; justify-content: space-between; - align-items: flex-start; + align-items: stretch; margin: 10px; } -.second-section div div { +.second-section div div { /* container */ display: flex; flex: 1; flex-direction: column; box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.2); - border-radius: 10px; + border-radius: 15px; + border: 5px black solid; + background-color: var(--color1); padding: 3%; align-items: center; justify-content: center; @@ -250,8 +313,12 @@ html, body { transition: transform 0.3s; } -.container:hover{ - transform: scale(1.05); +.second-section > *{ + max-width: 1200px; +} + +.container:hover { + transform: scale(1.05); } .container p { @@ -260,21 +327,25 @@ html, body { } .container h3 { - font-weight: 400; - color: var(--color1); + font-family: "Rubik Mono One"; + color: var(--fontColor1); } .container button { font-weight: 300; font-size: 14px; - border: none; - border-radius: 8px; + border-radius: 15px; padding: 5px 10px 5px 10px; - background-color: var(--color1); + background-color: var(--color2); + transition: all 0.1s; + border: 2px solid transparent; + } .container button:hover { - background-color: #6c99c6; + background-color: var(--color2); + border: 2px solid black; + scale: 105%; } .container button a { @@ -282,7 +353,6 @@ html, body { } /* Third section */ - .third-section { display: flex; flex-direction: column; @@ -300,14 +370,16 @@ html, body { .third-section button { font-weight: 300; font-size: 16px; - border: none; + border: 2px transparent solid; border-radius: 15px; padding: 8px 15px 8px 15px; background-color: var(--color1); + transition: all 0.1s; } .third-section button:hover { - background-color: #6c99c6; + background-color: var(--color2); + border: 2px black solid; } .third-section button a { @@ -321,23 +393,49 @@ html, body { } /* Responsive of all sections */ +@media screen and (max-width: 1450px) { + .titles h1 { + font-size: 80px; + } + + .titles p { + font-size: 15px; + } + + .header-body::after { + top: 150px; + left: 460px; + width: 400px; + height: 200px; + } + + .header-body h1 { + max-width: 500px; + } +} @media screen and (max-width: 1000px) { .titles h1 { font-size: 80px; } - + .titles p { font-size: 15px; } + .header-body::after { + top: 300px; + left: 300px; + width: 400px; + height: 200px; + } } @media screen and (max-width: 700px) { .titles h1 { font-size: 50px; } - + .titles p { font-size: 15px; } @@ -346,18 +444,22 @@ html, body { flex-direction: column; } - .second-section-pregunta, .third-section h2 { + .second-section-pregunta, + .third-section h2 { font-size: 30px; } - .second-section-respuesta, .third-section p { + .second-section-respuesta, + .third-section p { padding: 0 8px 0 8px; } - .container p, .second-section p, .third-section p { + .container p, + .second-section p, + .third-section p { font-size: 13px; } - + .container h3 { font-size: 15px; } @@ -367,7 +469,7 @@ html, body { } .second-section div { - align-items: center; + align-items: stretch; } .third-section button { @@ -376,10 +478,72 @@ html, body { border-radius: 10px; padding: 5px 10px 5px 10px; } + + .header-body::after { + top: -10px; + left: 250px; + width: 200px; + height: 100px; + } } -/* Footer */ +@media screen and (max-width: 440px) { + .titles h1 { + font-size: 40px; + } + + .titles p { + font-size: 15px; + } + + .second-section div { + flex-direction: column; + } + + .second-section-pregunta, + .third-section h2 { + font-size: 30px; + } + + .second-section-respuesta, + .third-section p { + padding: 0 8px 0 8px; + } + + .container p, + .second-section p, + .third-section p { + font-size: 13px; + } + + .container h3 { + font-size: 15px; + } + + .container button { + font-size: 10px; + } + + .second-section div { + align-items: stretch; + } + .third-section button { + font-weight: 200; + font-size: 15px; + border-radius: 10px; + padding: 5px 10px 5px 10px; + } + + .header-body::after { + top: -20px; + left: 120px; + width: 200px; + height: 100px; + } +} + +/* Footer */ .footer { display: flex; flex-direction: row; @@ -389,14 +553,15 @@ html, body { min-height: 30vh; width: 100%; column-gap: 10px; - background-color: #094d91B0; + background-color: var(--color1); + /*This had an opacity but sue me*/ /* background: linear-gradient(36deg, #094d91 0%, rgba(146,189,87,1) 100%); */ } .footer-socials { display: flex; flex-direction: column; - + align-items: center; width: 190px; } @@ -423,7 +588,7 @@ html, body { @media (max-width: 600px) { .footer { flex-direction: column; - align-items:center; + align-items: center; row-gap: 20px; } } @@ -431,18 +596,18 @@ html, body { margin: 20px 10px; border-left: 6px solid white; height: 30vh; - } +} .logos { width: 100vw; display: flex; flex-direction: row; justify-content: center; - } +} .footer-socials li { list-style: none; - margin-top: 5px; + margin-top: 5px; } .socials-div ul { @@ -451,8 +616,8 @@ html, body { justify-content: space-around; } -.socials-div li{ - +.socials-div li { + font-weight: bold; display: inline; font-size: 1rem; @@ -462,7 +627,13 @@ html, body { .footer-socials li a { color: var(--fontColor2); opacity: 80%; - font-size: 1.2rem + font-size: 1.2rem; + filter: drop-shadow(0px 2px 0px var(--color2)); + &:hover{ + filter: drop-shadow(0px 4px 1px var(--color2)); + translate: 0px -4px; + }; + transition: all 0.1s; } .socials-div li a { @@ -484,13 +655,25 @@ html, body { position: relative; top: 10px; width: 140px - } .logo-cover { - height: 90px; + height: 90px; } .x-logo { position: relative; top: 1px } + +/* + ▄▄▄ + ▄█ █▄ + ▀█ █ █▀ + ▄▀▀ █ ▀▀▄ + █▒▒ ▒▒█ + █▒▒▒▒▒▒▒█ + ▀▄▄▄▄▄▄▄▀ + █ █ + ▀▀ ▀▀ + Hey!, you found Kiwi the Kiwi :D +*/ \ No newline at end of file From 815bdf43697a8938b395d8a99a89880cba5e3d36 Mon Sep 17 00:00:00 2001 From: Joan Rios i Pla <104719628+JoanRiosiPla@users.noreply.github.com> Date: Sat, 16 Nov 2024 18:44:33 +0100 Subject: [PATCH 2/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c143780..6cdf30d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ Hola -Esto es la página web de acm + makers \ No newline at end of file +Esto es la página web de makers a partir de la página web del 2024 de acm + makers. From 840899f9d42ad9283db7ee345c3bb098aa297954 Mon Sep 17 00:00:00 2001 From: Joan Rios i Pla <104719628+JoanRiosiPla@users.noreply.github.com> Date: Sat, 16 Nov 2024 18:45:23 +0100 Subject: [PATCH 3/6] Create static.yml --- .github/workflows/static.yml | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/static.yml diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml new file mode 100644 index 0000000..0ba8230 --- /dev/null +++ b/.github/workflows/static.yml @@ -0,0 +1,43 @@ +# Simple workflow for deploying static content to GitHub Pages +name: Deploy static content to Pages + +on: + # Runs on pushes targeting the default branch + push: + branches: ["master"] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: read + pages: write + id-token: write + +# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. +# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. +concurrency: + group: "pages" + cancel-in-progress: false + +jobs: + # Single deploy job since we're just deploying + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Setup Pages + uses: actions/configure-pages@v5 + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 + with: + # Upload entire repository + path: '.' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 From d9899058ca161fd0638b42f1660c6d574057c8e6 Mon Sep 17 00:00:00 2001 From: Joan Rios i Pla <104719628+JoanRiosiPla@users.noreply.github.com> Date: Sat, 23 Nov 2024 12:45:28 +0000 Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=9A=ABRemoved=20ACM,=20=F0=9F=96=8C?= =?UTF-8?q?=EF=B8=8FChanaged=20Dates,=20Signup=20Link,=20=F0=9F=93=88Added?= =?UTF-8?q?=20rules,=F0=9F=A4=B8=E2=80=8D=E2=99=80=EF=B8=8FInclusive=20Lan?= =?UTF-8?q?guage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calendario/calendario.html | 34 +++++++++----------- css/style.css | 58 ++++++++++++++++++++++++++++++++--- equipo/equipo.html | 50 +++++++++--------------------- index.html | 30 ++++++------------ retos/retos.html | 63 ++++++++++++++++++++++---------------- 5 files changed, 129 insertions(+), 106 deletions(-) diff --git a/calendario/calendario.html b/calendario/calendario.html index 9bcf09a..3e5bb8e 100644 --- a/calendario/calendario.html +++ b/calendario/calendario.html @@ -1,38 +1,42 @@ - + - + - - + ORC +
-
-

Calendario

-

La competición tendrá lugar del 9 al 16 de mayo

-
-
+
+

Calendario
(Próximamente)

+
+

La competición tendrá lugar del 10 de febrero al 7 de marzo.

+
+

El calendario detallado con sesiones y talleres saldrá próximamente™.

+
+
-

¿Preparado?

+

¿Preparadx?

¿Tienes lo que se necesita superar los retos de la ORC? ¡Demuéstralo inscribiéndote hoy mismo! Sólo necesitas completar nuestro formulario para unirte a la competición:

From fd8ca5c3e7446a4926151ce9e627e56df59eb838 Mon Sep 17 00:00:00 2001 From: Joan Rios i Pla <104719628+JoanRiosiPla@users.noreply.github.com> Date: Sat, 23 Nov 2024 13:06:10 +0000 Subject: [PATCH 6/6] Added Icons --- calendario/calendario.html | 7 +++++++ equipo/equipo.html | 7 +++++++ favicon/apple-touch-icon.png | Bin 0 -> 3996 bytes favicon/favicon-96x96.png | Bin 0 -> 2432 bytes favicon/favicon.ico | Bin 0 -> 15086 bytes favicon/favicon.svg | 3 +++ favicon/site.webmanifest | 21 +++++++++++++++++++++ favicon/web-app-manifest-192x192.png | Bin 0 -> 4740 bytes favicon/web-app-manifest-512x512.png | Bin 0 -> 23737 bytes index.html | 7 +++++++ retos/retos.html | 7 +++++++ 11 files changed, 52 insertions(+) create mode 100644 favicon/apple-touch-icon.png create mode 100644 favicon/favicon-96x96.png create mode 100644 favicon/favicon.ico create mode 100644 favicon/favicon.svg create mode 100644 favicon/site.webmanifest create mode 100644 favicon/web-app-manifest-192x192.png create mode 100644 favicon/web-app-manifest-512x512.png diff --git a/calendario/calendario.html b/calendario/calendario.html index 3e5bb8e..90dbf86 100644 --- a/calendario/calendario.html +++ b/calendario/calendario.html @@ -12,6 +12,13 @@ ORC + + + + + + +
diff --git a/equipo/equipo.html b/equipo/equipo.html index c240981..384b6be 100644 --- a/equipo/equipo.html +++ b/equipo/equipo.html @@ -11,6 +11,13 @@ ORC + + + + + + +