Skip to content

Commit

Permalink
fix organizer wrapping on organizer for small screens, use permalink …
Browse files Browse the repository at this point in the history
…to supply index for organizers, and reconcile we need both fluid and non fluid layouts
  • Loading branch information
lauramoore committed Aug 23, 2017
1 parent 9ec5ec1 commit 82502a4
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 13 deletions.
5 changes: 1 addition & 4 deletions _layouts/bio.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
---
layout: default
layout: info
---
---
{% include navigation.html %}
<section id="speaker" class="bg-light-gray details"
style="margin-top: 2em; text-align: left; padding-bottom: 0">
<div class="row">
Expand Down Expand Up @@ -49,4 +47,3 @@ <h4>
</div>
</div>
</section>
{% include footer.html %}
9 changes: 9 additions & 0 deletions _layouts/info-fluid.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
layout: default
---
{% include navigation.html %}
<div class="container-fluid {{ page.theme | default: "conference-info"}}" >
{{ content }}
</div>

{% include footer.html %}
3 changes: 0 additions & 3 deletions _layouts/info.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,5 @@
layout: default
---
{% include navigation.html %}
<div class="container-fluid {{ page.theme | default: "conference-info"}}" >
{{ content }}
</div>

{% include footer.html %}
9 changes: 9 additions & 0 deletions _layouts/page-fluid.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
layout: default
---
{% include navigation.html %}
<div class="container-fluid {{ page.theme | default: "conference-info"}}" >
{{ content }}
</div>
{% include sponsor-contact-aside.html %}
{% include footer.html %}
2 changes: 1 addition & 1 deletion _layouts/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: default
---
{% include navigation.html %}
<div class="container-fluid {{ page.theme | default: "conference-info"}}" >
<div class="{{ page.theme | default: "conference-info"}}" >
{{ content }}
</div>
{% include sponsor-contact-aside.html %}
Expand Down
6 changes: 3 additions & 3 deletions _organizers/gunnar-hillert.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ order: 1
first_name: Gunnar
last_name: Hillert
company:
twitter: https://twitter.com/ghillert
linkedin: https://www.linkedin.com/in/hillert
github: https://github.com/ghillert
twitter: ghillert
linkedin: hillert
github: ghillert
layout: bio
---
As a Staff Engineer for Pivotal, Gunnar is a core committer for the Spring Integration and Spring Cloud Data Flow open source projects and has also contributed to the Cloud Foundry project. He has been a member of the Spring team for over 4 years. Furthermore, Gunnar was the the president of the Atlanta Java Users Group 2010-2016 and is co-organizer for the DevNexus developer conference that attracted 1800 developers in 2016. A native of Berlin, Germany, and after spending 15 years in Atlanta, Gunnar now resides in Holualoa, Hawai‘i.
Expand Down
2 changes: 1 addition & 1 deletion cfp-details.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
layout: page
layout: page-fluid
new-cfp-url: 'https://cfp.connectevents.io/en/dn2018/cfp/session/new'
theme: cfp
---
Expand Down
2 changes: 1 addition & 1 deletion code-of-conduct.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
layout: info
layout: info-fluid
---
<section class="container-fluid conference-information" >
<h1 class="featured-header">Code of Conduct</h1>
Expand Down
1 change: 1 addition & 0 deletions organizers.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
layout: info
permalink: /organizers/index.html
---
<h1 class="featured-header">Organizers</h1>
<div class="row">
Expand Down

0 comments on commit 82502a4

Please sign in to comment.