Skip to content

Commit

Permalink
Merge branch 'main' of github.com:tarugoconf/TRG24-TOP
Browse files Browse the repository at this point in the history
Merge de mis cambios en speakers y el video subido por Oscar.
  • Loading branch information
dbonillaf committed Jun 30, 2024
2 parents 166d4bc + c7d06ef commit 48179da
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 2 deletions.
1 change: 1 addition & 0 deletions _includes/blocks/video/fields.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export default {
"src: file",
"id: text",
"caption: markdown",
"text_over: text",
{
type: "radio",
name: "mode",
Expand Down
14 changes: 14 additions & 0 deletions _includes/blocks/video/video.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,25 @@
max-height: 100vh;
object-fit: cover;
grid-column: 1 / -1;
grid-row: 1;
}
figcaption {
grid-row: 2;
grid-column: start / end;
}
p {
margin-bottom: 0;
}
}
.block-video-over {
grid-column: 1 / -1;
grid-row: 1;
align-self: center;
justify-self: center;
font-weight: 900;
z-index: 2;
color: white;
font-size: 9vw;
letter-spacing: -0.05em;
user-select: none;
}
2 changes: 2 additions & 0 deletions _includes/blocks/video/video.vto
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
}}
></video>

<div class="block-video-over">{{ block.text_over }}</div>

{{ if block.caption }}
<figcaption>
{{ block.caption |> md }}
Expand Down
2 changes: 1 addition & 1 deletion _includes/styles/ui/navbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ html {
font-size: var(--font-2-size);
letter-spacing: var(--font-2-spacing);
line-height: var(--line-height-text);
z-index: 2;
z-index: 3;

svg {
width: 1em;
Expand Down
Binary file removed files/video-example.webm
Binary file not shown.
Binary file added files/video-trg24.mp4
Binary file not shown.
3 changes: 2 additions & 1 deletion index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ blocks:
- [**Jimenez**](#){data-hover="Jimenez"}
- [**Open Space**](#){data-hover="Open Space"}
- type: video
src: /files/video-example.webm
src: /files/video-trg24.mp4
caption: '[Ver el vídeoresumen de la pasada edición](https://vimeo.com/928563768)'
text_over: COMUNIDAD
mode: background
title: probando
text: "**aquifdsandoamso** fdsaoi jdosijf das<h4>Que pasa por aqui</h4>\r\n*molantes*"
Expand Down

0 comments on commit 48179da

Please sign in to comment.