Skip to content

Commit

Permalink
Add text breaking to headings
Browse files Browse the repository at this point in the history
Remove non-unix line breaks in layout templates
  • Loading branch information
lorenzschmid committed Feb 29, 2024
1 parent 796dbc9 commit 0e4e005
Show file tree
Hide file tree
Showing 11 changed files with 551 additions and 551 deletions.
10 changes: 5 additions & 5 deletions _layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% include partials/header.html %}

{{ content }}

{% include partials/footer.html %}
{% include partials/header.html %}

{{ content }}

{% include partials/footer.html %}
2 changes: 1 addition & 1 deletion _layouts/home.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% include partials/header.html %}

<div class="jumbotron">
<h1 class="display-3">
<h1 class="display-3 text-break">
{% if site.conference.main.logo.img %}
<img src="{{ site.conference.main.logo.img | prepend: '/assets/images/' | prepend: site.baseurl }}" class="w-75 d-none d-md-inline" alt="{{ site.title }}" />
<img src="{{ site.conference.main.logo.img | prepend: '/assets/images/' | prepend: site.baseurl }}" class="w-100 d-md-none" alt="{{ site.title }}" />
Expand Down
50 changes: 25 additions & 25 deletions _layouts/location.html
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{% include partials/header.html %}

{% assign this_room = page %}

<h1 class="display-5 mb-3">
{% if page.title %}
{{ page.title }}
{% else %}
{{ site.data.lang[site.conference.lang].location.directions | default: "Directions" }}
{% endif %}
</h1>

{% assign this_room = page %}

{% unless site.conference.location.hide %}
{% include partials/navbar_rooms.html %}
{% endunless %}

{{ content }}

{% if site.conference.location.map %}
<div id="map" class="mt-4 mb-3"></div>
{% endif %}

{% include partials/footer.html %}
{% include partials/header.html %}

{% assign this_room = page %}

<h1 class="display-5 mb-3 text-break">
{% if page.title %}
{{ page.title }}
{% else %}
{{ site.data.lang[site.conference.lang].location.directions | default: "Directions" }}
{% endif %}
</h1>

{% assign this_room = page %}

{% unless site.conference.location.hide %}
{% include partials/navbar_rooms.html %}
{% endunless %}

{{ content }}

{% if site.conference.location.map %}
<div id="map" class="mt-4 mb-3"></div>
{% endif %}

{% include partials/footer.html %}
26 changes: 13 additions & 13 deletions _layouts/page.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{% include partials/header.html %}

{% if page.title -%}
<h1 class="display-5 mb-3">{{ page.title }}</h1>
{%- endif %}

{{ content }}

{% if page.map %}
<div id="map" class="mt-4 mb-3"></div>
{% endif %}

{% include partials/footer.html %}
{% include partials/header.html %}

{% if page.title -%}
<h1 class="display-5 mb-3 text-break">{{ page.title }}</h1>
{%- endif %}

{{ content }}

{% if page.map %}
<div id="map" class="mt-4 mb-3"></div>
{% endif %}

{% include partials/footer.html %}
2 changes: 1 addition & 1 deletion _layouts/program.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% include partials/header.html %}
{% assign nbr_days = site.data.program.days | size -%}

<h1 class="display-5 {% if nbr_days > 1 -%} mb-2 {%- else -%} mb-4 {%- endif %}">
<h1 class="display-5 {% if nbr_days > 1 -%} mb-2 {%- else -%} mb-4 {%- endif %} text-break">
{%- if page.title -%}
{{- page.title -}}
{%- else -%}
Expand Down
140 changes: 70 additions & 70 deletions _layouts/room.html
Original file line number Diff line number Diff line change
@@ -1,70 +1,70 @@
{%- assign this_room = page -%}

{%- unless this_room.hide or site.conference.location.hide -%}
{%- include partials/header.html -%}

<!-- title for print: -->
<h1 class="display-5 mb-3 d-none d-print-inline">
{{ this_room.name }}
</h1>

<!-- title shown in browser: -->
<h1 class="display-5 mb-3 d-print-none">
{{ site.data.lang[site.conference.lang].location.rooms | default: "Rooms" }}
</h1>

{% include partials/navbar_rooms.html %}

{{ content }}

{% assign room_talks = false %}
{% for d in site.data.program.days %}
{% include partials/get_day_hash.html %}
{% for r in d.rooms %}
{% if this_room.name == r.name and r.talks.size > 0 %}
{% unless room_talks %}
<h5 class="mt-4 mb-2">
{{ site.data.lang[site.conference.lang].location.talks | default: "Talks in this room" }}:
</h5>
{% assign room_talks = true %}
{% endunless %}

<h6 class="mt-1 mb-0">
{{- day_name -}}
</h6>

<table class="list-program">
{%- for t in r.talks -%}
{%- assign talk = site.talks | where: 'name', t.name | first -%}
{%- include partials/get_main_category.html %}

<tr>
<td class="pr-2">
{%- include partials/get_talk_time.html -%}
{%- assign talk_day_hide = true -%}
{%- assign talk_time_styleclass = "w-100" -%}
{% include partials/show_talk_time.html %}

{%- assign live_button_styleclass = "w-100" -%}
{% include partials/show_live_button.html %}
</td>
<td class="pl-2 border-soft-{{ main_cat_color }}">
<p class="mb-0">
{%- include partials/show_talk.html -%}
</p>
<p class="font-weight-light mb-0">
{%- include partials/list_speakers.html -%}
</p>
</td>
</tr>
{%- endfor -%}

</table>
{%- break -%}

{% endif %}
{% endfor %}
{% endfor %}

{%- include partials/footer.html -%}
{%- endunless -%}
{%- assign this_room = page -%}

{%- unless this_room.hide or site.conference.location.hide -%}
{%- include partials/header.html -%}

<!-- title for print: -->
<h1 class="display-5 mb-3 d-none d-print-inline">
{{ this_room.name }}
</h1>

<!-- title shown in browser: -->
<h1 class="display-5 mb-3 d-print-none text-break">
{{ site.data.lang[site.conference.lang].location.rooms | default: "Rooms" }}
</h1>

{% include partials/navbar_rooms.html %}

{{ content }}

{% assign room_talks = false %}
{% for d in site.data.program.days %}
{% include partials/get_day_hash.html %}
{% for r in d.rooms %}
{% if this_room.name == r.name and r.talks.size > 0 %}
{% unless room_talks %}
<h5 class="mt-4 mb-2">
{{ site.data.lang[site.conference.lang].location.talks | default: "Talks in this room" }}:
</h5>
{% assign room_talks = true %}
{% endunless %}

<h6 class="mt-1 mb-0">
{{- day_name -}}
</h6>

<table class="list-program">
{%- for t in r.talks -%}
{%- assign talk = site.talks | where: 'name', t.name | first -%}
{%- include partials/get_main_category.html %}

<tr>
<td class="pr-2">
{%- include partials/get_talk_time.html -%}
{%- assign talk_day_hide = true -%}
{%- assign talk_time_styleclass = "w-100" -%}
{% include partials/show_talk_time.html %}

{%- assign live_button_styleclass = "w-100" -%}
{% include partials/show_live_button.html %}
</td>
<td class="pl-2 border-soft-{{ main_cat_color }}">
<p class="mb-0">
{%- include partials/show_talk.html -%}
</p>
<p class="font-weight-light mb-0">
{%- include partials/list_speakers.html -%}
</p>
</td>
</tr>
{%- endfor -%}

</table>
{%- break -%}

{% endif %}
{% endfor %}
{% endfor %}

{%- include partials/footer.html -%}
{%- endunless -%}
94 changes: 47 additions & 47 deletions _layouts/speaker-overview.html
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
{% include partials/header.html %}

<h1 class="display-5 mb-4">
{% if page.title %}
{{ page.title }}
{% else %}
{{ site.data.lang[site.conference.lang].speaker.overview | default: "Speakers" }}
{% endif %}
</h1>

{{ content }}

<div class="speakerlist">
{% assign cur_letter = false %}
{% assign speakers = site.speakers | sort_natural: 'last_name' %}
{% for speaker in speakers %}

{% assign last_letter = speaker.last_name | slice: 0 | capitalize %}
{% if cur_letter != last_letter %}
{% if cur_letter %}
</ul>
</div>
{% endif %}

{% assign cur_letter = last_letter %}
<div class="speakergroup">
<h3>{{ cur_letter }}</h3>
<ul class="list-unstyled">
{% endif %}

<li class="font-weight-light">
{% if speaker.hide %}
{{ speaker.first_name }} {{ speaker.last_name }}
{% else %}
<a href="{{ speaker.url | prepend: site.baseurl }}">
{{ speaker.first_name }} {{ speaker.last_name }}
</a>
{% endif %}
</li>

{% endfor %}

</ul>
</div>
</div>

{% include partials/footer.html %}
{% include partials/header.html %}

<h1 class="display-5 mb-4 text-break">
{% if page.title %}
{{ page.title }}
{% else %}
{{ site.data.lang[site.conference.lang].speaker.overview | default: "Speakers" }}
{% endif %}
</h1>

{{ content }}

<div class="speakerlist">
{% assign cur_letter = false %}
{% assign speakers = site.speakers | sort_natural: 'last_name' %}
{% for speaker in speakers %}

{% assign last_letter = speaker.last_name | slice: 0 | capitalize %}
{% if cur_letter != last_letter %}
{% if cur_letter %}
</ul>
</div>
{% endif %}

{% assign cur_letter = last_letter %}
<div class="speakergroup">
<h3>{{ cur_letter }}</h3>
<ul class="list-unstyled">
{% endif %}

<li class="font-weight-light">
{% if speaker.hide %}
{{ speaker.first_name }} {{ speaker.last_name }}
{% else %}
<a href="{{ speaker.url | prepend: site.baseurl }}">
{{ speaker.first_name }} {{ speaker.last_name }}
</a>
{% endif %}
</li>

{% endfor %}

</ul>
</div>
</div>

{% include partials/footer.html %}
Loading

0 comments on commit 0e4e005

Please sign in to comment.