Carousel was flakey, but keeping some venue images

writethedocs · Jan 15, 2015 · d122cf2 · d122cf2
1 parent ce671e7
commit d122cf2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 62 deletions.
diff --git a/docs/conf/na/2015.md b/docs/conf/na/2015.md
@@ -1,39 +1,5 @@
 template: conf.2015.html
 
-<style>
-#slideshow { 
-    margin: 50px 0 400px; 
-    position: relative; 
-    width: 100%; 
-    padding: 10px; 
-}
-
-#slideshow > div { 
-    position: absolute; 
-    top: 10px; 
-    left: 10px; 
-    right: 10px; 
-    bottom: 10px; 
-}
-</style>
-
-<script>
-$( document ).ready(function() {
-
-	$("#slideshow > div:gt(0)").hide();
-
-	setInterval(function() { 
-	  $('#slideshow > div:first')
-	    .fadeOut(1000)
-	    .next()
-	    .fadeIn(1000)
-	    .end()
-	    .appendTo('#slideshow');
-	},  3000);
-});
-</script>
-
-
 # North America 2015
 
 Join us for a three-day event to explore the art and science of documentation.
@@ -44,33 +10,13 @@ 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">
-	<div class="col-md-10 col-md-offset-1">
-		<div id="slideshow">
-			<div>
-				<img src="https://farm8.staticflickr.com/7437/14175146165_f6d22c5c3b_c.jpg" class="img-responsive"  alt="IMG_1479">	
-			</div>
-		   <div>
-				<img src="https://farm8.staticflickr.com/7443/14198154853_0cddd983b6_c.jpg" class="img-responsive"  alt="IMG_1603"> 
-			</div>
-			<div>
-			<img src="https://farm3.staticflickr.com/2932/14178008664_a696f31eb2_c.jpg" class="img-responsive" alt="IMG_1846">
-			</div>
-		   <div>
-				<img src="https://farm6.staticflickr.com/5527/14175399982_b13b415443_c.jpg" class="img-responsive"  alt="IMG_2538">
-			</div>
-		   <div>
-				<img src="https://farm8.staticflickr.com/7329/14171854031_08d26084d1_c.jpg" class="img-responsive"  alt="Group_Photo_2014_T">
-			</div>
-		   <div>
-				<img src="https://farm8.staticflickr.com/7359/14171848131_734e95d87d_c.jpg" class="img-responsive"  alt="Hike_Forest_05">
-			</div>
-		   <div>
-				<img src="https://farm8.staticflickr.com/7369/13991334230_27e72622c2_c.jpg" class="img-responsive"  alt="IMG_1833">
-			</div>
-		</div>
-	</div>
+<div class="row images-venue">
+  <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" />
+  </div>
 </div>
 
 ## Events

diff --git a/theme/conf.2015.html b/theme/conf.2015.html
@@ -13,8 +13,8 @@
         <div class="hero-nav col-md-8 col-md-offset-2 col-sm-12">
           <ul class="nav nav-pills nav-center">
             <li><a href="#north-america-2015">About</a></li>
-            <li class="highlight"><a href="#subscribe">Subscribe</a></li>
             <li><a href="#events">Events</a></li>
+            <li class="highlight"><a href="#subscribe">Subscribe</a></li>
           </ul>
         </div>
       </div>

diff --git a/theme/css/2015.main.css b/theme/css/2015.main.css
@@ -142,3 +142,17 @@ ul.nav.nav-center > li {
 ul.nav.nav-center {
     text-align: center;
 }
+
+/* Other */
+div.images-venue {
+    overflow: auto;
+    margin-top: 1em;
+}
+
+div.images-venue img {
+    width: 100%;
+    padding: .5em;
+    box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+}