Merge branch 'develop' into gh-pages

_posts/2013-01-13-Afinancialstitle.html

@@ -0,0 +1,14 @@
+---
+layout: fullpage
+title: Stories
+notitle: true
+pagetype: quote
+bgcolor: 999595
+nosidebar: true
+published: true
+section: financials
+---
+<div class="title">
+	<h1>FINANCIALS</h1>
+</div>
+

_posts/2013-01-14-Apresstitle.html

@@ -0,0 +1,14 @@
+---
+layout: fullpage
+title: Stories
+notitle: true
+pagetype: quote
+bgcolor: 6D6E71
+nosidebar: true
+published: true
+section: press
+---
+<div class="title">
+	<h1>PRESS</h1>
+</div>
+

_posts/2013-01-14-note.html → _posts/2013-01-15-note.html

@@ -1,13 +1,10 @@
 ---
 layout: fullpage
-title: A note from<br/>our team
 image: imageofficesummit
 pagetype: story
-extrapadding: 50px;
 published: true
 section: foundersnote
 ---
-
 <div class="getinvolved">
 
   <div class="row-fluid">

_posts/2013-01-16-Anotetitle.html

@@ -0,0 +1,14 @@
+---
+layout: fullpage
+title: Stories
+notitle: true
+pagetype: quote
+bgcolor: 999595
+nosidebar: true
+published: true
+section: foundersnote
+---
+<div class="title">
+	<h1>TEAM NOTE</h1>
+</div>
+

_posts/2013-01-21-fellowship.html → _posts/2013-01-23-fellowship.html

@@ -10,21 +10,16 @@
 ---
 
 <div class="morefellows">
-	<div class="row-fluid">
-		<div class="span8">
-    		<p>This is a 50 word blurb. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed risus turpis, interdum at semper ut, lacinia vel urna. Sed sit amet ultrices neque. Nunc consequat id urna vel blandit. Nunc iaculis elementum enim, eget blandit orci facilisis at. Nullam a ipsum dapibus, venenatis arcu nec, congue tortor.</p>
-    	</div>
-    </div>
-	<div class="row-fluid">
-	  <div class="span8 summary">
-	    <div class="row-fluid">
-			<div class="span2 logo">
-				<img class="progicons" src="img/fellowship_logo.png"/>
-			</div>
-			<div class="span10">
-				<h3>Fellowship</h3>
+		<div class="row-fluid">
+		  <div class="span8 summary">
+		    <div class="row-fluid">
+				<div class="span2 logo">
+					<img class="progicons" src="img/fellowship_logo.png"/>
+				</div>
+				<div class="span10">
+					<h3>Fellowship</h3>
+				</div>
 			</div>
-		</div>
 
 			<div class="row-fluid">
 				<div class="span12">
@@ -42,38 +37,38 @@ <h3>10</h3>
 		  </div>
 		</div>
 		<br>
+
 		<div class="row-fluid">
-			<div class="bios">
-				<div class="span6">
-					<img src="http://www.codeforamerica.org/media/images/people/andrew-hyder.jpg" alt="Andrew Hyder" />
-					<br>
-				</div>
-				<div class="span6 bioright">
-					<h3>Andrew <span> Hyder</span></h3>			
-					<h5>2013 Fellow on Team Kansas City</h5>
-					<p>"The Code for America Fellowship was as transformative for us as it was for Kansas City. When our year was done, those cities had changed us. Sure, they now have Innovation Departments, Open Data policies, and civic hacking volunteers. Yet we Fellows learned how to take the work that we know, our design, coding, and organizing skills, and apply it to something we love, improving our cities. I went from being some guy that made maps, to being a leader in the civic technology movement. Win win. And now I'm BBQ connoisseur too!"</p>
-				</div>
-			</div>
+		    <div class="bios">
+		      <div class="span3">
+		        <img src="img/andrew_spotlight.png" alt="Andrew Hyder" />
+		      </div>
+		      <div class="span7 bioright">
+		        <p>"The Code for America Fellowship was as transformative for us as it was for Kansas City. When our year was done, those cities had changed us. Sure, they now have Innovation Departments, Open Data policies, and civic hacking volunteers. Yet we Fellows learned how to take the work that we know, our design, coding, and organizing skills, and apply it to something we love, improving our cities. I went from being some guy that made maps, to being a leader in the civic technology movement. Win win. And now I'm BBQ connoisseur too!"</p>
+		        <h3>Andrew Hyder</h3>
+		        <h5>2013 Fellow, Team Kansas City</h5>
+		      </div>
+		    </div>
 		</div>
 
 		<div class="row-fluid">
 			<div class="bios">
-				<div class="span6">
-					<img src="http://media2.govtech.com/images/770*1000/Beth_Niblock.jpg" alt="Beth Niblock" />
-					<br>
+				<div class="span3">
+					<img src="img/Beth_Niblock_spotlight.png" alt="Beth Niblock" />
 				</div>
 				<div class="span6 bioright">
+					<p>"The Criminal Justice Commission has been waiting since about 1980 to have something like this. When they saw the first real iteration of the dashboard there were literally tears in peoples eyes because they could answer questions in real time and they had confidence in the data. It was just breathtaking."</p>
 					<h3>Beth <span> Niblock</span></h3>			
 					<h5>CIO of Louisville, on the Criminal Justice Dashboard</h5>
-					<p>"The Criminal Justice Commission has been waiting since about 1980 to have something like this. When they saw the first real iteration of the dashboard there were literally tears in peoples eyes because they could answer questions in real time and they had confidence in the data. It was just breathtaking."</p>
 				</div>
 			</div>
 		</div>
-
+		<br><br>
 
 		<div class="row-fluid">
 			<div class="span12">
 				<h4>FELLOWS</h4>
+				<div class="line"></div>
 				<a class="morefellowspop alanw" rel="popover" data-toggle="popover" data-content="Team Summit County" data-original-title="Allen Williams" href="http://twitter.com/alanjosephwilli" target="_blank"></a>
 				<a class="morefellowspop andrewh" rel="popover" data-toggle="popover" data-content="Team Kansas City" data-original-title="Andrew Hyder" href="http://twitter.com/hackyourcity" target="_blank"></a>	
 				<a class="morefellowspop andyh" rel="popover" data-toggle="popover" data-content="Team San Francisco" data-original-title="Andy Hull" href="http://twitter.com/andyhull3" target="_blank"></a>
@@ -103,10 +98,11 @@ <h4>FELLOWS</h4>
 				<a class="morefellowspop tamaramp" rel="popover" data-toggle="popover" data-content="Team South Bend" data-original-title="Tamara Manik-Perlman" href="http://twitter.com/TamaraMP" target="_blank"></a>
 			</div>
 		</div>
-		<br><br><br>
+		<br><br><br><br>
 		<div class="row-fluid">
 			<div class="span12">
 				<h4>CITIES</h4>
+				<div class="line"></div>
 				<a class="morefellowspop cityseal sf" data-html="true" rel="popover" data-toggle="popover" data-content="<br><em>Partner:</em><br>Tiana Wertheim<br><br><em>Project:</em><br>Promptly" data-original-title="San Francisco" href="http://www.promptly.io/" target="_blank"></a>
 				<a class="morefellowspop cityseal lv" data-html="true" rel="popover" data-toggle="popover" data-content="<br><em>Partner:</em><br>Pat Dues, Don Jacobson<br>and Joe Marcella<br><br><em>Project:</em><br>Development Fastpass" data-original-title="Las Vegas" href="http://www.codeforamerica.org/?cfa_app=development-fastpass" target="_blank"></a>
 				<a class="morefellowspop cityseal ok" data-html="true" rel="popover" data-toggle="popover" data-content="<br><em>Partners:</em><br>Karen Boyd and <br>Nicole Neditch<br><br><em>Project:</em><br>RecordTrac" data-original-title="Oakland" href="http://records.oaklandnet.com/" target="_blank"></a>

_posts/2013-01-24-Apeopleandprogramstitle.html

@@ -0,0 +1,16 @@
+---
+layout: fullpage
+title: Stories
+notitle: true
+pagetype: quote
+bgcolor: 399fd3
+nosidebar: true
+published: true
+extrapadding: 170px
+section: people
+---
+<div class="title">
+	<h1>PEOPLE &</h1>
+	<h1>PROGRAMS</h1>
+</div>
+

_posts/2013-01-22-educate.html → _posts/2013-01-27-educate.html

@@ -5,6 +5,7 @@
 bgcolor: cf1b41
 extrapadding: 30px
 section: educate
+nosidebar: true
 ---
 
 <div class="educate">

_posts/2013-01-28-Aeducatetitle.html

@@ -0,0 +1,14 @@
+---
+layout: fullpage
+title: Stories
+notitle: true
+pagetype: quote
+bgcolor: cf1b41
+nosidebar: true
+published: true
+section: educate
+---
+<div class="title">
+	<h1>EDUCATE</h1>
+</div>
+

_posts/2013-01-31-Aapplicationstitle.html

@@ -0,0 +1,14 @@
+---
+layout: fullpage
+title: Stories
+notitle: true
+pagetype: quote
+bgcolor: cf1b41
+nosidebar: true
+published: true
+section: apps
+---
+<div class="title">
+	<h1>APPLICATIONS</h1>
+</div>
+

_posts/2013-01-29-storiestitle.html → _posts/2013-02-04-storiestitle.html

@@ -6,7 +6,6 @@
 bgcolor: 399fd3
 nosidebar: true
 published: true
-extrapadding: 50px
 section: stories
 ---
 <div class="title">

_posts/2013-01-28-stories.html → _posts/2013-02-05-stories.html

@@ -7,7 +7,6 @@
 nosidebar: true
 published: true
 extrapadding: 50px
-section: stories
 ---
 
 <div class="stories">

css/screen.css

@@ -242,8 +242,8 @@ li {
 }
 
 .title {
-  min-height: 400px;
-  padding-bottom: 200px;
+  min-height: 0px;
+  padding-bottom: 0px;
 }
 
 .title h1,
@@ -254,7 +254,7 @@ li {
 }
 
 .title h1 {
-  font-size: 180px !important;
+  font-size: 130px !important;
   margin: 90px auto 117px;
   font-weight: 600;
 }
@@ -716,7 +716,7 @@ iframe.twitter-share-button{
 }
 
 .bios {
-  margin: 50px auto;
+  margin: 35px auto;
   float: left;
 }
 
@@ -2025,33 +2025,36 @@ img.progicons {
   margin-top: 0px;
 }
 
+.morefellows .bios p,
 .community .bios p,
 .market .bios p,
 .network .bios p {
   font-family: "Sentinel SSm A", "Sentinel SSm B", "Sentinel Book", "Georgia", Times, sans-serif;  
   font-size: 20px;
-  font-weight: 300;
+  font-weight: 100;
   line-height: 24px;
   margin-bottom: 10px;
 }
 
+.morefellows .bios h3,
 .community .bios h3,
 .market .bios h3,
 .network .bios h3 {
-  font-size: 18px;
-  margin: 10px 0px 0px 0px;
+  font-size: 20px;
+  margin: 20px 0px 0px 0px;
   text-align: left;
 }
 
+.morefellows .bios h5,
 .community .bios h5,
 .market .bios h5,
 .network .bios h5 {
-/*  font-size: 16px;
+font-size: 18px;
   line-height: 20px;
   font-size: 16px;
   line-height: 15px;
   margin: 0px 0px 0px 0px;
-  text-align: left;*/
+  text-align: left;
 }
 
 .market .stats h4 {

js/main.js

@@ -791,14 +791,16 @@ $(function(){
   });
 
   markerLayer.addCallback("markeradded", function(l, m){
+    console.log("markeradded");
+    console.log($(m.element));
     displayedMarkers.push(m);
     // console.log(displayedMarkers);
-    if($(m.element).attr("class").indexOf("marker") === -1)
-      return;
-    $(m.element).css("top", "-1000px");
+    // if($(m.element).attr("class").indexOf("marker") === -1)
+    //   return;
+    // $(m.element).css("top", "-1000px");
 
+    $(m.element).fadeIn(400);
     setTimeout(function(){
-      $(m.element).animate({"top":"0px"}, 400);
     }, Math.random() * 300);
 
   });