Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cards #119

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix cards #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
692c9ed
Move title to center of screen on narrow layout
achikin Jul 3, 2018
525c021
Fixed mitaps layout
achikin Jul 3, 2018
86eee63
Fixed speakers layout
achikin Jul 3, 2018
d2a0a11
Meetups as a list rather than cards
achikin Jul 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions _layouts/page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
---
layout: main
---
<h1>{{page.title}}</h1>
<br>
<style>
@media (max-width: 767px) {
.page-title {text-align: center}
}

.card-margin {margin: 0px 20px 20px 0px;}

@media (max-width: 767px) {
.card-margin {margin: 0px 0px 20px 0px}
}
</style>

<h1 class="page-title">{{page.title}}</h1>
<br>
{{content}}
41 changes: 22 additions & 19 deletions meetups.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,39 @@
title: Встречи
permalink: /meetups/
---
<style>
.one-column {}
@media (max-width: 767px) {
.one-column {display: flex; flex-direction: column;}
}
</style>

{% assign meetups = site.posts | sort: 'meetup_slug' | reverse %}

<div class="row">
<ul class="list-inline">
{% for meetup in meetups %}
{% if meetup.categories contains 'meetup' %}
<li>
<a href={{meetup.url}}><h5 class="card-title">#{{meetup.meetup_slug}} {{meetup.title}}</h5></a>
<p class="font-weight-light">{{meetup.event_date | date: "%Y-%m-%d"}}</span>
</li>
{% endif %}
{% endfor %}
</ul>
<!--
<div class="card-columns one-column">
{% for meetup in meetups %}
{% if meetup.categories contains 'meetup' %}

<div class="col-lg-4">
<div class="card" style="width: 20rem; margin-bottom: 10px">
<img class="card-img-top" src="{{meetup.logo}}" alt="{{meetup.title}}">
<div class="card card-margin" style="max-width: 30rem;">
<a href={{meetup.url}}><img class="card-img-top" src="{{meetup.logo}}" alt="{{meetup.title}}"></a>
<div class="card-body">
<h5 class="card-title">
<a href="{{meetup.url}}">{{meetup.title}}</a>
</h5>
<p class="font-weight-light">{{meetup.event_date | date: "%Y-%m-%d"}}</p>
</div>
</div>
</div>

{% endif %}
{% endfor %}
</div>


<div class="row">
{% for speaker in site.speakers %}

{% assign modIndex = forloop.index | modulo: 3 %}
{% if modIndex == 0 %}
</div>
<div class="row">
{% endif %}
{% endfor %}
</div>
--->
35 changes: 20 additions & 15 deletions speakers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,28 @@
title: Докладчики
permalink: /speakers/
---
<style>
.card-layout {display: flex; align-items: stretch; flex-wrap: wrap; justify-content: center}

<div class="row">
@media (max-width: 767px) {
.card-layout {display: flex; flex-direction: column; align-items: center}
}

.speaker-card {width: 16rem;}

@media (max-width: 767px) {
.speaker-card {width: 16rem;}
}
</style>
<div class="card-layout">
{% for speaker in site.speakers %}
<div class="col-lg-3">
<div class="card" style="width: 16rem; margin-bottom: 10px">
<img class="card-img-top" src="{{speaker.avatar}}" alt="{{speaker.title}}">
<div class="card-body">
<h5 class="card-title">
<a href="{{speaker.url}}">{{speaker.title}}</a>
</h5>
</div>
<div class="card speaker-card card-margin">
<a href={{speaker.url}}><img class="card-img-top" src="{{speaker.avatar}}" alt="{{speaker.title}}"/></a>
Copy link
Contributor

@trubachev trubachev Jul 3, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

можно всю карточку обернуть в <a>

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Согласен.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Так слетает автоматическое выравнивание по высоте в карточке.

<div class="card-body">
<h5 class="card-title">
<a href="{{speaker.url}}">{{speaker.title}}</a>
</h5>
</div>
</div>
{% assign modIndex = forloop.index | modulo: 4 %}
{% if modIndex == 0 %}
</div>
<div class="row">
{% endif %}
{% endfor %}
</div>
</div>