Skip to content

Commit

Permalink
Merge pull request #513 from PyBAQ/eventos-visual
Browse files Browse the repository at this point in the history
Ajustes en html y css de evento
  • Loading branch information
pyjavo authored Jun 15, 2024
2 parents 0dd1857 + bb82e7f commit 59b8d5a
Show file tree
Hide file tree
Showing 7 changed files with 71 additions and 66 deletions.
2 changes: 1 addition & 1 deletion assets/static/gen/styles.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/static/gen/styles.css.map

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ speaker_bio:
----
attach:
#### talk ####
title: Fernando Llinás - La Entrevista: Una oportunidad para la vida
title: La Entrevista: Una oportunidad para la vida
----
details: 10:43am - 10:50am
----
Expand Down
2 changes: 1 addition & 1 deletion scss/pages/_pages.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import 'about';
@import 'blog';
@import 'post';
@import 'contact';
10 changes: 7 additions & 3 deletions scss/pages/_blog.scss → scss/pages/_post.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.blog-post {
.blog-post, .event-post {
max-width: 860px;
margin: 0.75rem;
width: 100%;
Expand Down Expand Up @@ -40,8 +40,8 @@
}

h2, h3, h4{
margin-top: 4rem;
margin-bottom: 4rem;
margin-top: 2rem;
margin-bottom: 1rem;
}

blockquote p{
Expand Down Expand Up @@ -85,4 +85,8 @@

.post-excerpt {
font-size: 1.2rem;
}

.ctitle {
margin: 1.5rem 0 1rem;
}
38 changes: 20 additions & 18 deletions templates/blocks/talk.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
<h2 class="title">{{ this.title }}</h2>
<div class="details">
{{this.details}}
</div>
<div class="attachments">
{{this.attach}}
</div>
<div class="speaker">
{% if this.speaker %}
{% set speaker = site.get('nosotros/' + this.speaker, alt) %}
<a href="{{ speaker|url }}">{{ speaker.name }}</a>
{% else %}
{{this.speaker_name}}
{% endif %}
</div>
<div class="speaker-bio">
{{this.speaker_bio}}
</div>
<div class="talk">
<div class="speaker">
{% if this.speaker %}
{% set speaker = site.get('nosotros/' + this.speaker, alt) %}
<a href="{{ speaker|url }}"><h2>{{ speaker.name }}</h2></a>
{% else %}
<h2>{{this.speaker_name}}</h2>
{% endif %}
</div>
<div class="speaker-bio">
{{this.speaker_bio}}
</div>
<h3 class="title">{{ this.title }}</h3>
<div class="details">
{{this.details}}
</div>
<div class="attachments">
{{this.attach}}
</div>
</div>
81 changes: 40 additions & 41 deletions templates/evento.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,51 @@

{% block body %}
<div class="d-flex justify-content-center">
<p><img src='{{ this.featured_photo
if this.featured_photo
else "/img/event-placeholder.jpg" }}'
class="img-fluid rounded-start" alt="..."></p>
</div>
<div class="d-flex justify-content-center">
<div class="blog-post">
<div class="post-meta blog_post-post_meta">
<h1 class="ctitle">{{ this.title }}</h1>
<div id="body-content" class="blog-post-body">
<div class=event-details>
{% if this.venue %}
<div class="venue">
<strong>{{ this.venue }}</strong>
{% if this.address_1 %}
<span>{{ this.address_1 }}</span>
{% endif %}
</div>
<div class="event-post">
{% if this.youtube %}
<div class="row">
<div class="ratio ratio-16x9">
<iframe src="https://www.youtube.com/embed/{{this.youtube}}?rel=0" allowfullscreen></iframe>
</div>
</div>
{% else %}
<div class="d-flex justify-content-center">
<img src='{{ this.featured_photo
if this.featured_photo
else "/img/event-placeholder.jpg" }}'
class="img-fluid rounded-start" alt="...">
</div>
{% endif %}
<h1 class="ctitle">{{ this.title }}</h1>
<div id="body-content" class="blog-post-body">
<div class=event-details>
<div class="date">
{% if alt == 'en' %}
{{ this.date_start | datetimeformat("EEEE, MMMM d, y, H:mm") }}
{% else %}
{{ this.date_start | datetimeformat("EEEE, d 'de' MMMM 'de' y, h:mm a") }}
{% endif %}
<div class="date">
{% if alt == 'en' %}
{{ this.date_start | datetimeformat("EEEE, MMMM d, y, H:mm") }}
{% else %}
{{ this.date_start | datetimeformat("EEEE, d 'de' MMMM 'de' y, h:mm a") }}
</div>
{% if this.venue %}
<div class="venue">
<strong>{{ this.venue }}</strong>
{% if this.address_1 %}
<span>{{ this.address_1 }}</span>
{% endif %}
</div>
<div class="attach">
{{ this.attach }}
</div>
{% if this.youtube %}
<div class="row">
<div class="ratio ratio-16x9">
<iframe src="https://www.youtube.com/embed/{{this.youtube}}?rel=0" allowfullscreen></iframe>
</div>
</div>
{% endif %}
<div class="talks">
{{ this.talks }}
</div>
<a href="{{this.link}}">Meetup</a>
<div class="details">
{{ this.information }}
</div>
{% endif %}
<a href="{{this.link}}">Meetup</a>
<div class="details">
{{ this.information }}
</div>
<div class="attach">
{{ this.attach }}
</div>
<div class="talks">
{{ this.talks }}
</div>
<div class="comments">{{ render_disqus_comments() }}</div>
</div>
<div class="comments">{{ render_disqus_comments() }}</div>
</div>
</div>
</div>
Expand Down

0 comments on commit 59b8d5a

Please sign in to comment.