Skip to content
This repository has been archived by the owner on May 16, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:hasgeek/phpcloud
Browse files Browse the repository at this point in the history
  • Loading branch information
@pradeepto
pradeepto committed Jul 4, 2011
2 parents 89273d2 + 4ac6363 commit 15faaa5
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 50 deletions.
10 changes: 5 additions & 5 deletions sass/_layout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ footer {
height: 110px;
margin: 0;
color: #FFE;
text-shadow: 0 1px 2px black;
@include text-shadow(#000 0 1px 2px);
font-size: 16px;
line-height: 20px;
overflow: hidden;
Expand All @@ -836,12 +836,12 @@ footer {
li {
display: block;
height: 100%;
text-align:center;
text-align: center;
strong {
display: block;
font-size:22px;
margin:20px auto 0 auto;
height: 30px;
font-size: 22px;
margin: 15px auto 0 auto;
height: 35px;
}
em {
font-style: italic;
Expand Down
82 changes: 41 additions & 41 deletions www/css/screen.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ a:hover, a:active {

header {
background-color: #bceef7;
background-image: url('../img/gradient1.svg?1308068196');
background-image: url('../img/gradient1.svg?1309782405');
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bceef7), color-stop(100%, #5abcec));
background-image: -webkit-linear-gradient(#bceef7, #5abcec);
background-image: -moz-linear-gradient(#bceef7, #5abcec);
Expand All @@ -325,7 +325,7 @@ header {
text-indent: -119988px;
overflow: hidden;
text-align: left;
background-image: url('../img/planesprite.png?1308122646');
background-image: url('../img/planesprite.png?1309782405');
background-repeat: no-repeat;
background-position: 50% 50%;
position: absolute;
Expand Down Expand Up @@ -403,7 +403,7 @@ header {
text-indent: -119988px;
overflow: hidden;
text-align: left;
background-image: url('../img/cloudsprite.png?1309778990');
background-image: url('../img/cloudsprite.png?1309782404');
background-repeat: no-repeat;
background-position: 50% 50%;
position: absolute;
Expand Down Expand Up @@ -502,7 +502,7 @@ h1#site-title {
text-indent: -119988px;
overflow: hidden;
text-align: left;
background-image: url('../img/logo.png?1309778990');
background-image: url('../img/logo.png?1309782405');
background-repeat: no-repeat;
background-position: 50% 50%;
width: 600px;
Expand All @@ -517,7 +517,7 @@ h1#site-title {
text-indent: -119988px;
overflow: hidden;
text-align: left;
background-image: url('../img/hasgeek-presents.png?1309778990');
background-image: url('../img/hasgeek-presents.png?1309782405');
background-repeat: no-repeat;
background-position: 50% 50%;
width: 100px;
Expand Down Expand Up @@ -675,7 +675,7 @@ hr {

#sponsors-section {
background-color: #bceef7;
background-image: url('../img/gradient2.svg?1308068363');
background-image: url('../img/gradient2.svg?1309782405');
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5abcec), color-stop(100%, #bceef7));
background-image: -webkit-linear-gradient(#5abcec, #bceef7);
background-image: -moz-linear-gradient(#5abcec, #bceef7);
Expand All @@ -689,7 +689,7 @@ hr {
text-indent: -119988px;
overflow: hidden;
text-align: left;
background-image: url('../img/sponsors.png?1309715119');
background-image: url('../img/sponsors.png?1309782405');
background-repeat: no-repeat;
background-position: 50% 50%;
width: 799px;
Expand Down Expand Up @@ -807,7 +807,7 @@ hr {
}

.sponsor-popup {
background-image: url('../img/gradient2.svg?1308068363');
background-image: url('../img/gradient2.svg?1309782405');
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5abcec), color-stop(100%, #bceef7));
background-image: -webkit-linear-gradient(#5abcec, #bceef7);
background-image: -moz-linear-gradient(#5abcec, #bceef7);
Expand Down Expand Up @@ -960,7 +960,7 @@ hr {
text-indent: -119988px;
overflow: hidden;
text-align: left;
background-image: url('../img/blimp.png?1309778990');
background-image: url('../img/blimp.png?1309782404');
background-repeat: no-repeat;
background-position: 50% 50%;
width: 681px;
Expand All @@ -987,7 +987,7 @@ hr {

#ground-transition {
background-color: #bceef7;
background-image: url('../img/gradient3.svg?1308068431');
background-image: url('../img/gradient3.svg?1309782405');
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bceef7), color-stop(100%, #f9ae1f));
background-image: -webkit-linear-gradient(#bceef7, #f9ae1f);
background-image: -moz-linear-gradient(#bceef7, #f9ae1f);
Expand All @@ -1005,7 +1005,7 @@ hr {
text-indent: -119988px;
overflow: hidden;
text-align: left;
background-image: url('../img/jetpack-ride.png?1309778990');
background-image: url('../img/jetpack-ride.png?1309782405');
background-repeat: no-repeat;
background-position: 50% 50%;
width: 229px;
Expand All @@ -1024,7 +1024,7 @@ hr {
text-indent: -119988px;
overflow: hidden;
text-align: left;
background-image: url('../img/meghaman.png?1308162731');
background-image: url('../img/meghaman.png?1309782405');
background-repeat: no-repeat;
background-position: 50% 50%;
width: 300px;
Expand Down Expand Up @@ -1112,7 +1112,7 @@ a:hover .exspace, a:hover .exspace {
}

#hoarding {
background-image: url('../img/hoarding.png?1309778990');
background-image: url('../img/hoarding.png?1309782405');
background-repeat: no-repeat;
background-position: 50% 50%;
width: 503px;
Expand All @@ -1137,7 +1137,7 @@ a:hover .exspace, a:hover .exspace {
text-indent: -119988px;
overflow: hidden;
text-align: left;
background-image: url('../img/balloon.png?1309778990');
background-image: url('../img/balloon.png?1309782404');
background-repeat: no-repeat;
background-position: 50% 50%;
width: 201px;
Expand Down Expand Up @@ -1185,15 +1185,15 @@ footer {
}

#underground1 {
background-image: url('../img/underground1.png?1309778990');
background-image: url('../img/underground1.png?1309782405');
background-repeat: no-repeat;
background-position: 50% 50%;
height: 132px;
position: relative;
}

#underground2 {
background-image: url('../img/underground2.jpg?1309778990');
background-image: url('../img/underground2.jpg?1309782405');
background-repeat: no-repeat;
background-position: 50% 0;
height: 478px;
Expand Down Expand Up @@ -1221,7 +1221,7 @@ footer {
height: 110px;
margin: 0;
color: #FFE;
text-shadow: 0 1px 2px black;
text-shadow: black 0 1px 2px;
font-size: 16px;
line-height: 20px;
overflow: hidden;
Expand All @@ -1235,8 +1235,8 @@ footer {
#scrolling_credits li strong {
display: block;
font-size: 22px;
margin: 20px auto 0 auto;
height: 30px;
margin: 15px auto 0 auto;
height: 35px;
}
#scrolling_credits li em {
font-style: italic;
Expand Down Expand Up @@ -1376,51 +1376,51 @@ footer {
ordered & tabbed in a way that represents the nesting of the generated HTML.
*/
#cboxOverlay {
background: url('../img/colorbox/overlay.png?1267763662') repeat 0 0;
background: url('../img/colorbox/overlay.png?1309782405') repeat 0 0;
}

#cboxTopLeft {
width: 21px;
height: 21px;
background: url('../img/colorbox/controls.png?1248981180') no-repeat -100px 0;
background: url('../img/colorbox/controls.png?1309782404') no-repeat -100px 0;
}

#cboxTopRight {
width: 21px;
height: 21px;
background: url('../img/colorbox/controls.png?1248981180') no-repeat -129px 0;
background: url('../img/colorbox/controls.png?1309782404') no-repeat -129px 0;
}

#cboxBottomLeft {
width: 21px;
height: 21px;
background: url('../img/colorbox/controls.png?1248981180') no-repeat -100px -29px;
background: url('../img/colorbox/controls.png?1309782404') no-repeat -100px -29px;
}

#cboxBottomRight {
width: 21px;
height: 21px;
background: url('../img/colorbox/controls.png?1248981180') no-repeat -129px -29px;
background: url('../img/colorbox/controls.png?1309782404') no-repeat -129px -29px;
}

#cboxMiddleLeft {
width: 21px;
background: url('../img/colorbox/controls.png?1248981180') left top repeat-y;
background: url('../img/colorbox/controls.png?1309782404') left top repeat-y;
}

#cboxMiddleRight {
width: 21px;
background: url('../img/colorbox/controls.png?1248981180') right top repeat-y;
background: url('../img/colorbox/controls.png?1309782404') right top repeat-y;
}

#cboxTopCenter {
height: 21px;
background: url('../img/colorbox/border.png?1248981048') 0 0 repeat-x;
background: url('../img/colorbox/border.png?1309782404') 0 0 repeat-x;
}

#cboxBottomCenter {
height: 21px;
background: url('../img/colorbox/border.png?1248981048') 0 -29px repeat-x;
background: url('../img/colorbox/border.png?1309782404') 0 -29px repeat-x;
}

#cboxContent {
Expand Down Expand Up @@ -1464,7 +1464,7 @@ footer {
position: absolute;
bottom: 0;
left: 0;
background: url('../img/colorbox/controls.png?1248981180') no-repeat -75px 0;
background: url('../img/colorbox/controls.png?1309782404') no-repeat -75px 0;
width: 25px;
height: 25px;
text-indent: -9999px;
Expand All @@ -1478,7 +1478,7 @@ footer {
position: absolute;
bottom: 0;
left: 27px;
background: url('../img/colorbox/controls.png?1248981180') no-repeat -50px 0;
background: url('../img/colorbox/controls.png?1309782404') no-repeat -50px 0;
width: 25px;
height: 25px;
text-indent: -9999px;
Expand All @@ -1489,18 +1489,18 @@ footer {
}

#cboxLoadingOverlay {
background: url('../img/colorbox/loading_background.png?1244353794') no-repeat center center;
background: url('../img/colorbox/loading_background.png?1309782405') no-repeat center center;
}

#cboxLoadingGraphic {
background: url('../img/colorbox/loading.gif?1240972710') no-repeat center center;
background: url('../img/colorbox/loading.gif?1309782405') no-repeat center center;
}

#cboxClose {
position: absolute;
bottom: 0;
right: 0;
background: url('../img/colorbox/controls.png?1248981180') no-repeat -25px 0;
background: url('../img/colorbox/controls.png?1309782404') no-repeat -25px 0;
width: 25px;
height: 25px;
text-indent: -9999px;
Expand Down Expand Up @@ -1529,35 +1529,35 @@ footer {
The following provides PNG transparency support for IE6
*/
.cboxIE6 #cboxTopLeft {
background: url('../img/colorbox/ie6/borderTopLeft.png?1299001080');
background: url('../img/colorbox/ie6/borderTopLeft.png?1309782404');
}

.cboxIE6 #cboxTopCenter {
background: url('../img/colorbox/ie6/borderTopCenter.png?1299001080');
background: url('../img/colorbox/ie6/borderTopCenter.png?1309782404');
}

.cboxIE6 #cboxTopRight {
background: url('../img/colorbox/ie6/borderTopRight.png?1299001080');
background: url('../img/colorbox/ie6/borderTopRight.png?1309782404');
}

.cboxIE6 #cboxBottomLeft {
background: url('../img/colorbox/ie6/borderBottomLeft.png?1299001080');
background: url('../img/colorbox/ie6/borderBottomLeft.png?1309782404');
}

.cboxIE6 #cboxBottomCenter {
background: url('../img/colorbox/ie6/borderBottomCenter.png?1299001080');
background: url('../img/colorbox/ie6/borderBottomCenter.png?1309782404');
}

.cboxIE6 #cboxBottomRight {
background: url('../img/colorbox/ie6/borderBottomRight.png?1299001080');
background: url('../img/colorbox/ie6/borderBottomRight.png?1309782404');
}

.cboxIE6 #cboxMiddleLeft {
background: url('../img/colorbox/ie6/borderMiddleLeft.png?1299001080');
background: url('../img/colorbox/ie6/borderMiddleLeft.png?1309782404');
}

.cboxIE6 #cboxMiddleRight {
background: url('../img/colorbox/ie6/borderMiddleRight.png?1299001080');
background: url('../img/colorbox/ie6/borderMiddleRight.png?1309782404');
}

.cboxIE6 #cboxTopLeft,
Expand Down
12 changes: 8 additions & 4 deletions www/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -901,10 +901,14 @@ <h2>Location, Location, Location</h2>
if(ul.length !== 1) return;
var slider = function(){
var li = ul.find("li").first();
li.slideUp(function(){
ul.append(li.detach().show());
setTimeout(slider,TIMER);
});
li.animate({
marginTop: '-125px'
}, 600, 'swing', function(){
ul.append(li.detach().css({
marginTop: ''
}));
setTimeout(slider,TIMER);
})
}
setTimeout(slider,TIMER);
});
Expand Down

0 comments on commit 15faaa5

Please sign in to comment.