Skip to content

Commit

Permalink
removed team member description from team page. team member now flex box
Browse files Browse the repository at this point in the history
  • Loading branch information
@gregsexauer
gregsexauer committed Apr 22, 2021
1 parent 73a0ad2 commit 1009097
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 114 deletions.
24 changes: 7 additions & 17 deletions _site/assets/css/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,15 @@ a:hover {
}

/****** Team Styling ******/
.team-member-container {
display: flex;
}

.team-member {
display: flex;
width: 40em;
width: 19em;
background-color: #cccccc;
margin-bottom: 1em;
margin: 1em;
padding: 1em;
}

Expand All @@ -163,28 +166,15 @@ a:hover {
margin-bottom: auto;
}

.team-member > img {
height: 256px;
width: 256px;
.team-member > figure > img {
height: 16em;
}

.team-member > figure > figcaption {
display: flex;
flex-direction: column;
}

.team-member-description {
margin-left: 1em;
}

.team-member-description > p {
margin-bottom: 1em;
}

.team-member-description > p:first-of-type {
margin-bottom: 0em;
}

.team-member-sidebar-container {

}
Expand Down
84 changes: 35 additions & 49 deletions _site/team.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,71 +44,57 @@ <h1>Concrete Studio</h1>
<div class="header-break"></div>
</nav>


<div class="post-container">
<div class="team-member">

<figure>
<img src="assets/images/Untitled.jpg" alt="Image of Greg Sexauer">
<figcaption>
<div class="team-member-container">

<div class="post-container">
<div class="team-member">

<a href="/authors/greg-sexauer.html">Greg Sexauer</a>

<figure>
<img src="assets/images/Untitled.jpg" alt="Image of Greg Sexauer">
<figcaption>

Lead Designer / Senior Developer

<a href="/authors/greg-sexauer.html">Greg Sexauer</a>



<a href= "mailto: gregsexauer@gmail.com">gregsexauer@gmail.com</a>

Lead Designer / Senior Developer


<a href="assets/files/resume-gregsexauer.pdf" download>Resume</a>

</figcaption>
</figure>

<a href= "mailto: gregsexauer@gmail.com">gregsexauer@gmail.com</a>


<div class="team-member-description">
<p><p>Greg is currently a student at the University of Pittsburgh studying Digital Narratives &amp; Interactive Design and Politics &amp; Philosophy.</p>

<a href="assets/files/resume-gregsexauer.pdf" download>Resume</a>

</figcaption>
</figure>

<p>Greg designed and developed this website as a project for Composing Digital Media in the Spring of 2021.</p>
</p>
</div>

</div>
</div>

<div class="post-container">
<div class="team-member">

<figure>
<img src="assets/images/Untitled.jpg" alt="Image of Jane Doe">
<figcaption>


<a href="/authors/jane-doe.html">Jane Doe</a>


<div class="post-container">
<div class="team-member">

Lead Placeholder
<figure>
<img src="assets/images/Untitled.jpg" alt="Image of Jane Doe">
<figcaption>



<a href="/authors/jane-doe.html">Jane Doe</a>



</figcaption>
</figure>
Lead Placeholder

<div class="team-member-description">
<p><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Accumsan lacus vel facilisis volutpat. Metus aliquam eleifend mi in nulla posuere sollicitudin. Pellentesque sit amet porttitor eget dolor morbi. Ipsum dolor sit amet consectetur adipiscing. Ultrices mi tempus imperdiet nulla malesuada pellentesque elit eget. Est sit amet facilisis magna etiam tempor orci. Ac odio tempor orci dapibus ultrices in iaculis nunc sed. Nascetur ridiculus mus mauris vitae. Nibh praesent tristique magna sit amet purus gravida quis. Et sollicitudin ac orci phasellus egestas. Urna et pharetra pharetra massa massa. In ornare quam viverra orci.</p>


<p>Dolor magna eget est lorem ipsum dolor sit amet. Enim nulla aliquet porttitor lacus luctus accumsan. Scelerisque fermentum dui faucibus in ornare quam viverra orci sagittis. Netus et malesuada fames ac turpis egestas sed tempus urna. Eget nulla facilisi etiam dignissim diam quis. Egestas maecenas pharetra convallis posuere morbi leo. Rutrum tellus pellentesque eu tincidunt tortor aliquam nulla facilisi. Aenean et tortor at risus. A scelerisque purus semper eget. Pellentesque elit ullamcorper dignissim cras tincidunt lobortis feugiat. Id faucibus nisl tincidunt eget. Diam phasellus vestibulum lorem sed. Mi bibendum neque egestas congue quisque egestas. Egestas diam in arcu cursus euismod quis viverra nibh. Nibh sed pulvinar proin gravida hendrerit lectus a. Et ligula ullamcorper malesuada proin libero nunc consequat interdum varius. Sed cras ornare arcu dui vivamus arcu. Tellus in hac habitasse platea. Sit amet consectetur adipiscing elit duis tristique. Consectetur libero id faucibus nisl tincidunt eget nullam.</p>

</figcaption>
</figure>

<p>Libero id faucibus nisl tincidunt eget nullam non nisi est. Lobortis elementum nibh tellus molestie nunc non blandit massa enim. Justo eget magna fermentum iaculis eu. Mauris commodo quis imperdiet massa tincidunt nunc pulvinar. At augue eget arcu dictum varius duis at consectetur lorem. Aliquet porttitor lacus luctus accumsan tortor posuere ac ut. Turpis egestas integer eget aliquet nibh praesent tristique magna. At erat pellentesque adipiscing commodo. Elit scelerisque mauris pellentesque pulvinar pellentesque habitant. Eget nunc scelerisque viverra mauris in aliquam sem fringilla ut. Netus et malesuada fames ac turpis egestas. Ut tristique et egestas quis ipsum. Ut consequat semper viverra nam libero justo laoreet sit. Proin sagittis nisl rhoncus mattis rhoncus urna neque viverra. Dictum varius duis at consectetur. Adipiscing elit ut aliquam purus sit amet luctus. Et malesuada fames ac turpis egestas integer. Magna fermentum iaculis eu non diam phasellus vestibulum lorem sed.</p>
</p>
</div>

</div>
</div>


</div>

<!--- TODO make this less linear --->

Expand Down
24 changes: 7 additions & 17 deletions assets/css/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,15 @@ a:hover {
}

/****** Team Styling ******/
.team-member-container {
display: flex;
}

.team-member {
display: flex;
width: 40em;
width: 19em;
background-color: #cccccc;
margin-bottom: 1em;
margin: 1em;
padding: 1em;
}

Expand All @@ -163,28 +166,15 @@ a:hover {
margin-bottom: auto;
}

.team-member > img {
height: 256px;
width: 256px;
.team-member > figure > img {
height: 16em;
}

.team-member > figure > figcaption {
display: flex;
flex-direction: column;
}

.team-member-description {
margin-left: 1em;
}

.team-member-description > p {
margin-bottom: 1em;
}

.team-member-description > p:first-of-type {
margin-bottom: 0em;
}

.team-member-sidebar-container {

}
Expand Down
60 changes: 29 additions & 31 deletions team.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,36 @@
title: Team
---

{% for author in site.authors %}
<div class="post-container">
<div class="team-member">

<figure>
<img src="{{ author.image }}" alt="Image of {{ author.name }}">
<figcaption>

{% if site.environment == "production" %}
<a href="{{ site.base_path }}{{ author.url }}">{{ author.name }}</a>
{% else %}
<a href="{{ author.url }}">{{ author.name }}</a>
{% endif %}

{{ author.position }}

{% if author.email %}
<a href= "mailto: {{ author.email }}">{{ author.email }}</a>
{% endif %}

{% if author.resume %}
<a href="{{ author.resume }}" download>Resume</a>
{% endif %}
</figcaption>
</figure>

<div class="team-member-description">
<p>{{ author.content | markdownify }}</p>
</div>
<div class="team-member-container">
{% for author in site.authors %}
<div class="post-container">
<div class="team-member">

<figure>
<img src="{{ author.image }}" alt="Image of {{ author.name }}">
<figcaption>

{% if site.environment == "production" %}
<a href="{{ site.base_path }}{{ author.url }}">{{ author.name }}</a>
{% else %}
<a href="{{ author.url }}">{{ author.name }}</a>
{% endif %}

{{ author.position }}

{% if author.email %}
<a href= "mailto: {{ author.email }}">{{ author.email }}</a>
{% endif %}

{% if author.resume %}
<a href="{{ author.resume }}" download>Resume</a>
{% endif %}
</figcaption>
</figure>

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

<!--- TODO make this less linear --->

0 comments on commit 1009097

Please sign in to comment.