Skip to content

Commit

Permalink
new images for #2
Browse files Browse the repository at this point in the history
  • Loading branch information
benheb committed Jul 15, 2013
1 parent 4306f97 commit ffd87eb
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 7 deletions.
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ module.exports = function(grunt) {
'images/down-arrow.png': 'dev/images/down-arrow.png',
'images/1999-okc.jpg': 'dev/images/1999-okc.jpg',
'images/1992-1.jpg': 'dev/images/1992-1.jpg',
'images/joplin.png': 'dev/images/joplin.png'
'images/joplin.png': 'dev/images/joplin.png',
'images/2011-tor.jpg': 'dev/images/2011-tor2.jpg'
}
}
}
Expand Down
15 changes: 14 additions & 1 deletion css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ path {
}

#blurb-seven {
background: url(../images/blurb-tor.png) right fixed !important;
background: url(../images/2011-tor.jpg) right fixed !important;
}

#blurb-eight {
Expand Down Expand Up @@ -573,6 +573,19 @@ path {
color: #444;
}


#blurb-seven .info {
width: 320px;
position: absolute;
font-weight: normal;
color: #FEFEFE;
line-height: 1px;
}

#blurb-seven {
opacity:0.9;
}

#blurb-five .info {
font-weight: normal;
color: #444;
Expand Down
Binary file added dev/images/2011-tor2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/2011-tor.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,10 @@
<div class="number">0</div>
</span>
</div>
</div>
<div class="info" id="seven-info">
The 2011 tornado outbreak eclipsed the 1974 outbreak for the largest of all time. There were 337 confirmed tornadoes over the three day span, with
over 11 billion dollars in damage across 17 states.
</div>
</div>
</div>
Expand Down Expand Up @@ -348,10 +352,7 @@
<script src="js/jquery.appear.js"></script>
<script src="js/jquery.scrollorama.js"></script>
<script src="js/tornadoes.min.js"></script>
<!--
<script src="js/app.js"></script>
<script src="js/intro"></script>
-->

<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
Expand Down
7 changes: 7 additions & 0 deletions js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ var torApp = function() {
*/
//scrollorama.animate('#blurb-six',{ duration: 300, property:'padding-top', start:600,end:0, pin: true });

/*
*
* Section SEVEN
*
*/
scrollorama.animate('#seven-info',{ delay: 220, duration: 430, property:'line-height', start:0,end:3 });

/*
* Footer
*
Expand Down
2 changes: 1 addition & 1 deletion js/tornadoes.min.js

Large diffs are not rendered by default.

0 comments on commit ffd87eb

Please sign in to comment.