Skip to content

Commit

Permalink
Merge pull request #304 from bangkokrb/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
olivierobert authored May 29, 2023
2 parents 12654f1 + 6da4539 commit c163e81
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 9 deletions.
9 changes: 7 additions & 2 deletions frontend/stylesheets/components/_list-speaker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
margin-block-start: 1rem;

font-size: map-get(variables.$font-sizes, 'lg');
line-height: 1.4;

@include media-breakpoint-up('sm') {
font-size: map-get(variables.$font-sizes, 'xl');
Expand All @@ -47,11 +48,15 @@

&-link:not(:hover) {
color: variables.$base-font-color;
}
}
}

&__bio {
margin-top: 1rem;

&--mini {
margin-top: 0.6rem;
}
}
}

Expand All @@ -61,4 +66,4 @@
@include media-breakpoint-up('sm') {
grid-template-columns: repeat(3, 1fr);
}
}
}
4 changes: 2 additions & 2 deletions frontend/stylesheets/screens/_home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ body.home .app-content {
body.home .speaker-lineup {

.list-speaker {
@include media-breakpoint-up('sm') {
grid-template-columns: repeat(3, 1fr);
@include media-breakpoint-up('md') {
grid-template-columns: repeat(4, 1fr);
}

&__photo {
Expand Down
2 changes: 1 addition & 1 deletion src/_components/card_talk.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
{% endif %}
<div class="card-talk__info">
<a href="/speakers#{{ speaker.id }}" class="card-talk__name text-branded">
<span>{{ speaker.first_name }}</span>&nbsp;{{ speaker.last_name }}
<span>{{ speaker.first_name }}</span> {{ speaker.last_name }}
</a>
{% if speaker.twitter_handle %}
<div class="card-talk__social">
Expand Down
8 changes: 7 additions & 1 deletion src/_components/list_speaker.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<img class="list-speaker__photo" src="{{ speaker.photo_url }}" alt="{{ speaker.first_name | smartify }} {{ speaker.last_name | smartify }}" />
</a>
<div class="list-speaker__name text-branded">
<span>{{ speaker.first_name }}</span>&nbsp;{{ speaker.last_name }}
<span>{{ speaker.first_name }}</span> {{ speaker.last_name }}
</div>
{% if with_info == true %}
<div class="list-speaker__info">
Expand All @@ -19,6 +19,12 @@
{% endif %}
<p class="list-speaker__bio">{{ speaker.bio }}</p>
</div>
{% else %}
{% if speaker.mini_bio %}
<small class="list-speaker__bio list-speaker__bio--mini">
{{ speaker.mini_bio }}
</small>
{% endif %}
{% endif %}
</li>
{% endfor %}
Expand Down
13 changes: 10 additions & 3 deletions src/_data/speakers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,25 @@
twitter_handle: matz
photo_url: /images/speakers/matz.jpg
type: keynote
bio: |
mini_bio: Creator of Ruby
- id: bernard-banta
first_name: Bernard
last_name: Banta
twitter_handle: Bantab
photo_url: /images/speakers/banta.jpg
type: keynote
bio: |
mini_bio: Ruby Kenya, founder of Finplus
- id: jemma-issroff
first_name: Jemma
last_name: Issroff
twitter_handle: jemmaissroff
photo_url: /images/speakers/jemma.jpg
type: keynote
bio: |
mini_bio: Founder of wnb.rb, GC expert
- id: ben-halpern
first_name: Ben
last_name: Halpern
twitter_handle: bendhalpern
photo_url: /images/speakers/ben.jpg
type: keynote
mini_bio: Creator of DEV, founder of Forem
Binary file added src/images/speakers/ben.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c163e81

Please sign in to comment.