Merge branch 'master' of git.c3d2.de:c3d2-web

This commit is contained in:
payload 2011-09-16 01:20:51 +02:00
commit 390702879b
2 changed files with 8 additions and 9 deletions

View File

@ -48,7 +48,7 @@ Raindrop.prototype.render = function() {
var t = now(); var t = now();
var d = (t - this.lastUpdate) / 1000; var d = (t - this.lastUpdate) / 1000;
this.x += this.speedX * d; this.x += this.speedX * d;
this.speedY += 9.81 * d; this.speedY += 23 * d; /* gravity */
this.y += this.speedY * d; this.y += this.speedY * d;
this.el.css('left', Math.floor(this.x)+'px'); this.el.css('left', Math.floor(this.x)+'px');
@ -91,7 +91,7 @@ Cloud.prototype.update = function() {
if (this.isDone()) if (this.isDone())
this.el.detach(); this.el.detach();
else if (this.raining && Math.random() < 0.1) else if (this.raining && Math.random() < 0.1)
new Raindrop(this.x + 8 + Math.random() * 48, this.y + 32, this.speedX); new Raindrop(this.x + 8 + Math.random() * 48, this.y + 30, this.speedX);
}; };
Cloud.prototype.isDone = function() { Cloud.prototype.isDone = function() {

View File

@ -31,6 +31,7 @@ body {
#content { #content {
border: 12pt solid #65b8ff; border: 12pt solid #65b8ff;
border-radius: 24pt; border-radius: 24pt;
background: rgba(255,255,255,0.65);
min-height: 400px; min-height: 400px;
} }
.leftSideBar { .leftSideBar {
@ -42,7 +43,6 @@ body {
} }
.leftSideBar > div { .leftSideBar > div {
margin: 12pt; margin: 12pt;
background: rgba(255,255,255,0.65);
} }
.leftSideBar > div > h2 { .leftSideBar > div > h2 {
font-size: 12pt; font-size: 12pt;
@ -63,7 +63,6 @@ a {
padding: 24pt; padding: 24pt;
} }
#bodyText > div { #bodyText > div {
background: rgba(255,255,255,0.65);
} }
.date { .date {
padding-left: 12pt; padding-left: 12pt;
@ -424,7 +423,7 @@ td.event {
-webkit-transform:rotate(0deg); -webkit-transform:rotate(0deg);
} }
100% { 100% {
-webkit-transform:rotate(360deg); -webkit-transform:rotate(-360deg);
} }
} }
@-moz-keyframes rotate { @-moz-keyframes rotate {
@ -432,7 +431,7 @@ td.event {
-moz-transform:rotate(0deg); -moz-transform:rotate(0deg);
} }
100% { 100% {
-moz-transform:rotate(360deg); -moz-transform:rotate(-360deg);
} }
} }
@-o-keyframes rotate { @-o-keyframes rotate {
@ -440,7 +439,7 @@ td.event {
-o-transform:rotate(0deg); -o-transform:rotate(0deg);
} }
100% { 100% {
-o-transform:rotate(360deg); -o-transform:rotate(-360deg);
} }
} }
@-ms-keyframes rotate { @-ms-keyframes rotate {
@ -448,7 +447,7 @@ td.event {
-ms-transform:rotate(0deg); -ms-transform:rotate(0deg);
} }
100% { 100% {
-ms-transform:rotate(360deg); -ms-transform:rotate(-360deg);
} }
} }
@keyframes rotate { @keyframes rotate {
@ -456,7 +455,7 @@ td.event {
transform:rotate(0deg); transform:rotate(0deg);
} }
100% { 100% {
transform:rotate(360deg); transform:rotate(-360deg);
} }
} }