Skip to content

Commit

Permalink
just merged rosses changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@dansinker
dansinker committed Apr 2, 2012
1 parent 510d948 commit 33da509
Show file tree
Hide file tree
Showing 10 changed files with 276 additions and 201 deletions.
31 changes: 8 additions & 23 deletions _site/fellowships/2011meet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<link rel="stylesheet" media="screen,projection,tv" href="/media/css/normalise.css" />
<link rel="stylesheet" media="screen,projection,tv" href="/media/css/devices.css" />
<link rel="stylesheet" media="all and (min-width:30em)" href="/media/css/desktop.css" />
<script type="text/javascript"src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<!--[if lt IE 9]>
<script type="text/javascript" src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<link rel="stylesheet" media="screen" href="media/css/desktop.css" />
Expand Down Expand Up @@ -73,7 +73,6 @@ <h1 id="brand">
<li id="fellowships"><a href="/fellowships">fellowships</a>
<li id="hackdays"><a href="/hackdays.html">hack days</a>
<li id="getinvolved"><a href="/getinvolved.html">community</a>
<li id="news"><a href="/news.html">news</a>
</ul>

</div>
Expand Down Expand Up @@ -157,7 +156,7 @@ <h3>Cole Gillespie | Zeit Online</h3>
<ul class = "fellowstats">
<li><a href="http://www.twitter.com/theCole">@theCole</a>
<li><a href="http://www.colegillespie.com">website</a>
<li><a href="github.com/coleGillespie">github</a>
<li><a href="http://github.com/coleGillespie">github</a>
</ul>


Expand Down Expand Up @@ -292,33 +291,19 @@ <h3>Get Involved</h3>
<div id="minifellows">
<h3>Meet the 2011/12 <br>Knight-Mozilla Fellows </h3>
<ul>
<li><img src="/media/img/fellows/mark_small.jpg"></li>
<li><img src="/media/img/fellows/cole_small.jpg"></li>
<li><img src="/media/img/fellows/laurian_small.jpg"></li>
<li><img src="/media/img/fellows/nicola_small.jpg"></li>
<li><img src="/media/img/fellows/dan_small.jpg"></li>
<li><img src="/media/img/fellows/mark_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/cole_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/laurian_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/nicola_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/dan_small.jpg" alt=""></li>
</ul>
<p>Our 2011/12 Knight-Mozilla Fellows are hacking the news at the BBC, the Guardian, Zeit Online, Al Jazeera English, and the Boston Globe. <b>Learn more about their experience.</b></p>
<p>Our 2011/12 Knight-Mozilla Fellows are hacking the news at the BBC, the Guardian, Zeit Online, Al Jazeera English, and the Boston Globe. <a href="/fellowships/2011meet.html">Learn more about their experience.</a></p>
</div>

<div id="newsbox">
<h3>The latest from the OpenNews team</h3>
<p>Read all our news in our <a id="feed_url" href="http://planet.drumbeat.org/mojo/rss20.xml">OpenNews feed</a></p>
</div>

<script type="text/javascript">
$('#minifellows').click(function(){
document.location.href='/fellowships/2011meet.html';
});

$('#involved').click(function(){
document.location.href='/getinvolved.html';
});

$('#newsbox').click(function(){
document.location.href='/news.html';
});
</script>
</aside>
</article>
</div>
Expand Down
172 changes: 149 additions & 23 deletions _site/fellowships/apply.html
View file

Large diffs are not rendered by default.

29 changes: 7 additions & 22 deletions _site/fellowships/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<link rel="stylesheet" media="screen,projection,tv" href="/media/css/normalise.css" />
<link rel="stylesheet" media="screen,projection,tv" href="/media/css/devices.css" />
<link rel="stylesheet" media="all and (min-width:30em)" href="/media/css/desktop.css" />
<script type="text/javascript"src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<!--[if lt IE 9]>
<script type="text/javascript" src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<link rel="stylesheet" media="screen" href="media/css/desktop.css" />
Expand Down Expand Up @@ -73,7 +73,6 @@ <h1 id="brand">
<li id="fellowships"><a href="/fellowships">fellowships</a>
<li id="hackdays"><a href="/hackdays.html">hack days</a>
<li id="getinvolved"><a href="/getinvolved.html">community</a>
<li id="news"><a href="/news.html">news</a>
</ul>

</div>
Expand Down Expand Up @@ -146,33 +145,19 @@ <h3>Get Involved</h3>
<div id="minifellows">
<h3>Meet the 2011/12 <br>Knight-Mozilla Fellows </h3>
<ul>
<li><img src="/media/img/fellows/mark_small.jpg"></li>
<li><img src="/media/img/fellows/cole_small.jpg"></li>
<li><img src="/media/img/fellows/laurian_small.jpg"></li>
<li><img src="/media/img/fellows/nicola_small.jpg"></li>
<li><img src="/media/img/fellows/dan_small.jpg"></li>
<li><img src="/media/img/fellows/mark_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/cole_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/laurian_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/nicola_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/dan_small.jpg" alt=""></li>
</ul>
<p>Our 2011/12 Knight-Mozilla Fellows are hacking the news at the BBC, the Guardian, Zeit Online, Al Jazeera English, and the Boston Globe. <b>Learn more about their experience.</b></p>
<p>Our 2011/12 Knight-Mozilla Fellows are hacking the news at the BBC, the Guardian, Zeit Online, Al Jazeera English, and the Boston Globe. <a href="/fellowships/2011meet.html">Learn more about their experience.</a></p>
</div>

<div id="newsbox">
<h3>The latest from the OpenNews team</h3>
<p>Read all our news in our <a id="feed_url" href="http://planet.drumbeat.org/mojo/rss20.xml">OpenNews feed</a></p>
</div>

<script type="text/javascript">
$('#minifellows').click(function(){
document.location.href='/fellowships/2011meet.html';
});

$('#involved').click(function(){
document.location.href='/getinvolved.html';
});

$('#newsbox').click(function(){
document.location.href='/news.html';
});
</script>
</aside>
</article>
</div>
Expand Down
29 changes: 7 additions & 22 deletions _site/fellowships/info.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<link rel="stylesheet" media="screen,projection,tv" href="/media/css/normalise.css" />
<link rel="stylesheet" media="screen,projection,tv" href="/media/css/devices.css" />
<link rel="stylesheet" media="all and (min-width:30em)" href="/media/css/desktop.css" />
<script type="text/javascript"src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<!--[if lt IE 9]>
<script type="text/javascript" src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<link rel="stylesheet" media="screen" href="media/css/desktop.css" />
Expand Down Expand Up @@ -73,7 +73,6 @@ <h1 id="brand">
<li id="fellowships"><a href="/fellowships">fellowships</a>
<li id="hackdays"><a href="/hackdays.html">hack days</a>
<li id="getinvolved"><a href="/getinvolved.html">community</a>
<li id="news"><a href="/news.html">news</a>
</ul>

</div>
Expand Down Expand Up @@ -210,33 +209,19 @@ <h3>Get Involved</h3>
<div id="minifellows">
<h3>Meet the 2011/12 <br>Knight-Mozilla Fellows </h3>
<ul>
<li><img src="/media/img/fellows/mark_small.jpg"></li>
<li><img src="/media/img/fellows/cole_small.jpg"></li>
<li><img src="/media/img/fellows/laurian_small.jpg"></li>
<li><img src="/media/img/fellows/nicola_small.jpg"></li>
<li><img src="/media/img/fellows/dan_small.jpg"></li>
<li><img src="/media/img/fellows/mark_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/cole_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/laurian_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/nicola_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/dan_small.jpg" alt=""></li>
</ul>
<p>Our 2011/12 Knight-Mozilla Fellows are hacking the news at the BBC, the Guardian, Zeit Online, Al Jazeera English, and the Boston Globe. <b>Learn more about their experience.</b></p>
<p>Our 2011/12 Knight-Mozilla Fellows are hacking the news at the BBC, the Guardian, Zeit Online, Al Jazeera English, and the Boston Globe. <a href="/fellowships/2011meet.html">Learn more about their experience.</a></p>
</div>

<div id="newsbox">
<h3>The latest from the OpenNews team</h3>
<p>Read all our news in our <a id="feed_url" href="http://planet.drumbeat.org/mojo/rss20.xml">OpenNews feed</a></p>
</div>

<script type="text/javascript">
$('#minifellows').click(function(){
document.location.href='/fellowships/2011meet.html';
});

$('#involved').click(function(){
document.location.href='/getinvolved.html';
});

$('#newsbox').click(function(){
document.location.href='/news.html';
});
</script>
</aside>
</article>
</div>
Expand Down
29 changes: 7 additions & 22 deletions _site/getinvolved.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<link rel="stylesheet" media="screen,projection,tv" href="/media/css/normalise.css" />
<link rel="stylesheet" media="screen,projection,tv" href="/media/css/devices.css" />
<link rel="stylesheet" media="all and (min-width:30em)" href="/media/css/desktop.css" />
<script type="text/javascript"src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<!--[if lt IE 9]>
<script type="text/javascript" src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<link rel="stylesheet" media="screen" href="media/css/desktop.css" />
Expand Down Expand Up @@ -73,7 +73,6 @@ <h1 id="brand">
<li id="fellowships"><a href="/fellowships">fellowships</a>
<li id="hackdays"><a href="/hackdays.html">hack days</a>
<li id="getinvolved"><a href="/getinvolved.html">community</a>
<li id="news"><a href="/news.html">news</a>
</ul>

</div>
Expand Down Expand Up @@ -137,33 +136,19 @@ <h3>Get Involved</h3>
<div id="minifellows">
<h3>Meet the 2011/12 <br>Knight-Mozilla Fellows </h3>
<ul>
<li><img src="/media/img/fellows/mark_small.jpg"></li>
<li><img src="/media/img/fellows/cole_small.jpg"></li>
<li><img src="/media/img/fellows/laurian_small.jpg"></li>
<li><img src="/media/img/fellows/nicola_small.jpg"></li>
<li><img src="/media/img/fellows/dan_small.jpg"></li>
<li><img src="/media/img/fellows/mark_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/cole_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/laurian_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/nicola_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/dan_small.jpg" alt=""></li>
</ul>
<p>Our 2011/12 Knight-Mozilla Fellows are hacking the news at the BBC, the Guardian, Zeit Online, Al Jazeera English, and the Boston Globe. <b>Learn more about their experience.</b></p>
<p>Our 2011/12 Knight-Mozilla Fellows are hacking the news at the BBC, the Guardian, Zeit Online, Al Jazeera English, and the Boston Globe. <a href="/fellowships/2011meet.html">Learn more about their experience.</a></p>
</div>

<div id="newsbox">
<h3>The latest from the OpenNews team</h3>
<p>Read all our news in our <a id="feed_url" href="http://planet.drumbeat.org/mojo/rss20.xml">OpenNews feed</a></p>
</div>

<script type="text/javascript">
$('#minifellows').click(function(){
document.location.href='/fellowships/2011meet.html';
});

$('#involved').click(function(){
document.location.href='/getinvolved.html';
});

$('#newsbox').click(function(){
document.location.href='/news.html';
});
</script>
</aside>
</article>
</div>
Expand Down
29 changes: 7 additions & 22 deletions _site/hackdays.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<link rel="stylesheet" media="screen,projection,tv" href="/media/css/normalise.css" />
<link rel="stylesheet" media="screen,projection,tv" href="/media/css/devices.css" />
<link rel="stylesheet" media="all and (min-width:30em)" href="/media/css/desktop.css" />
<script type="text/javascript"src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<!--[if lt IE 9]>
<script type="text/javascript" src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<link rel="stylesheet" media="screen" href="media/css/desktop.css" />
Expand Down Expand Up @@ -73,7 +73,6 @@ <h1 id="brand">
<li id="fellowships"><a href="/fellowships">fellowships</a>
<li id="hackdays"><a href="/hackdays.html">hack days</a>
<li id="getinvolved"><a href="/getinvolved.html">community</a>
<li id="news"><a href="/news.html">news</a>
</ul>

</div>
Expand Down Expand Up @@ -175,33 +174,19 @@ <h3>Get Involved</h3>
<div id="minifellows">
<h3>Meet the 2011/12 <br>Knight-Mozilla Fellows </h3>
<ul>
<li><img src="/media/img/fellows/mark_small.jpg"></li>
<li><img src="/media/img/fellows/cole_small.jpg"></li>
<li><img src="/media/img/fellows/laurian_small.jpg"></li>
<li><img src="/media/img/fellows/nicola_small.jpg"></li>
<li><img src="/media/img/fellows/dan_small.jpg"></li>
<li><img src="/media/img/fellows/mark_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/cole_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/laurian_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/nicola_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/dan_small.jpg" alt=""></li>
</ul>
<p>Our 2011/12 Knight-Mozilla Fellows are hacking the news at the BBC, the Guardian, Zeit Online, Al Jazeera English, and the Boston Globe. <b>Learn more about their experience.</b></p>
<p>Our 2011/12 Knight-Mozilla Fellows are hacking the news at the BBC, the Guardian, Zeit Online, Al Jazeera English, and the Boston Globe. <a href="/fellowships/2011meet.html">Learn more about their experience.</a></p>
</div>

<div id="newsbox">
<h3>The latest from the OpenNews team</h3>
<p>Read all our news in our <a id="feed_url" href="http://planet.drumbeat.org/mojo/rss20.xml">OpenNews feed</a></p>
</div>

<script type="text/javascript">
$('#minifellows').click(function(){
document.location.href='/fellowships/2011meet.html';
});

$('#involved').click(function(){
document.location.href='/getinvolved.html';
});

$('#newsbox').click(function(){
document.location.href='/news.html';
});
</script>
</aside>
</article>
</div>
Expand Down
29 changes: 7 additions & 22 deletions _site/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<link rel="stylesheet" media="screen,projection,tv" href="/media/css/normalise.css" />
<link rel="stylesheet" media="screen,projection,tv" href="/media/css/devices.css" />
<link rel="stylesheet" media="all and (min-width:30em)" href="/media/css/desktop.css" />
<script type="text/javascript"src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<!--[if lt IE 9]>
<script type="text/javascript" src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<link rel="stylesheet" media="screen" href="media/css/desktop.css" />
Expand Down Expand Up @@ -73,7 +73,6 @@ <h1 id="brand">
<li id="fellowships"><a href="/fellowships">fellowships</a>
<li id="hackdays"><a href="/hackdays.html">hack days</a>
<li id="getinvolved"><a href="/getinvolved.html">community</a>
<li id="news"><a href="/news.html">news</a>
</ul>

</div>
Expand Down Expand Up @@ -120,33 +119,19 @@ <h3>Get Involved</h3>
<div id="minifellows">
<h3>Meet the 2011/12 <br>Knight-Mozilla Fellows </h3>
<ul>
<li><img src="/media/img/fellows/mark_small.jpg"></li>
<li><img src="/media/img/fellows/cole_small.jpg"></li>
<li><img src="/media/img/fellows/laurian_small.jpg"></li>
<li><img src="/media/img/fellows/nicola_small.jpg"></li>
<li><img src="/media/img/fellows/dan_small.jpg"></li>
<li><img src="/media/img/fellows/mark_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/cole_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/laurian_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/nicola_small.jpg" alt=""></li>
<li><img src="/media/img/fellows/dan_small.jpg" alt=""></li>
</ul>
<p>Our 2011/12 Knight-Mozilla Fellows are hacking the news at the BBC, the Guardian, Zeit Online, Al Jazeera English, and the Boston Globe. <b>Learn more about their experience.</b></p>
<p>Our 2011/12 Knight-Mozilla Fellows are hacking the news at the BBC, the Guardian, Zeit Online, Al Jazeera English, and the Boston Globe. <a href="/fellowships/2011meet.html">Learn more about their experience.</a></p>
</div>

<div id="newsbox">
<h3>The latest from the OpenNews team</h3>
<p>Read all our news in our <a id="feed_url" href="http://planet.drumbeat.org/mojo/rss20.xml">OpenNews feed</a></p>
</div>

<script type="text/javascript">
$('#minifellows').click(function(){
document.location.href='/fellowships/2011meet.html';
});

$('#involved').click(function(){
document.location.href='/getinvolved.html';
});

$('#newsbox').click(function(){
document.location.href='/news.html';
});
</script>
</aside>
</article>
</div>
Expand Down
2 changes: 1 addition & 1 deletion _site/media/css/desktop.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Default template CSS - if you change anything here then updating will be a bit m
}
.fellowsbox {
padding-bottom: 20px;
padding-right: 0px;
padding-right: 10px;
padding-top: 18px;
margin-top: 20px;
width: 30%;
Expand Down
Loading

0 comments on commit 33da509

Please sign in to comment.