Skip to content

Commit

Permalink
Add two images under events
Browse files Browse the repository at this point in the history
  • Loading branch information
agjohnson committed Jan 15, 2015
1 parent f85e937 commit 14cc632
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
13 changes: 11 additions & 2 deletions docs/conf/na/2015.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ The main event takes place from **May 18-19 (Monday and Tuesday) from 9am to 6pm
We will return to the historic [Crystal Ballroom][crystal-ballroom],
[centrally located](http://goo.gl/maps/D2WrJ) in the heart of Portland.

<div class="row images-venue">
<div class="row row-images">
<div class="col-md-6 col-sm-6">
<img src="https://farm8.staticflickr.com/7443/14198154853_0cddd983b6_c.jpg" />
</div>
<div class="col-md-6 col-sm-6">
<img src="https://farm3.staticflickr.com/2932/14178008664_a696f31eb2_c.jpg" />
<img src="https://farm8.staticflickr.com/7369/13991334230_27e72622c2_c.jpg" />
</div>
</div>

Expand Down Expand Up @@ -43,6 +43,15 @@ Come early, get your badge and get to know other attendees.
#### Official Party - Monday night
Wind down and talk about the days talks in a relaxed and friendly environment

<div class="row row-images">
<div class="col-md-6 col-sm-6">
<img src="https://farm8.staticflickr.com/7359/14171848131_734e95d87d_c.jpg" />
</div>
<div class="col-md-6 col-sm-6">
<img src="https://farm8.staticflickr.com/7437/14175146165_f6d22c5c3b_c.jpg" />
</div>
</div>

## Subscribe

We will be announcing more information soon, including the call for proposals
Expand Down
8 changes: 3 additions & 5 deletions theme/css/2015.main.css
Original file line number Diff line number Diff line change
Expand Up @@ -135,22 +135,20 @@ ul.nav.nav-center {
}

/* Other */
div.images-venue {
div.row-images {
overflow: auto;
margin-top: 1em;
}

div.images-venue img {
div.row-images img {
width: 100%;
padding: .5em;
box-sizing: border-box;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
}


/* RTD Overrides */

div.injected {
display: none;
}
}

0 comments on commit 14cc632

Please sign in to comment.