Merge branch 'master' of git.c3d2.de:c3d2-web
Conflicts: content/static/datenspuren/style/style.css
This commit is contained in:
payload
commit
ed8e8bcd89
Binary file not shown.
|
Before Width: | Height: | Size: 315 B After Width: | Height: | Size: 410 B |
|
|
@ -9,8 +9,8 @@
|
|||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="1600"
|
||||
height="1600"
|
||||
width="8000"
|
||||
height="8000"
|
||||
id="svg2"
|
||||
version="1.1"
|
||||
inkscape:version="0.48.1 r9760"
|
||||
|
|
@ -24,9 +24,9 @@
|
|||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="0.35355339"
|
||||
inkscape:cx="907.24444"
|
||||
inkscape:cy="754.91962"
|
||||
inkscape:zoom="0.088388348"
|
||||
inkscape:cx="2468.9986"
|
||||
inkscape:cy="4383.3628"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
<dc:title />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(0,547.6378)">
|
||||
transform="translate(0,6947.6378)">
|
||||
<path
|
||||
sodipodi:type="star"
|
||||
style="fill:#ffff7c;fill-opacity:1;fill-rule:evenodd;stroke:none"
|
||||
|
|
@ -60,13 +60,13 @@
|
|||
sodipodi:cx="194.28571"
|
||||
sodipodi:cy="223.79076"
|
||||
sodipodi:r1="1127.0369"
|
||||
sodipodi:r2="56.351845"
|
||||
sodipodi:r2="11.270369"
|
||||
sodipodi:arg1="0.96380866"
|
||||
sodipodi:arg2="1.0386085"
|
||||
inkscape:flatsided="false"
|
||||
inkscape:rounded="0"
|
||||
inkscape:randomized="0"
|
||||
d="M 837.14281,1149.505 222.87975,272.34908 691.99208,1234.9784 215.32313,276.06845 535.72342,1297.8636 207.29658,278.62002 371.82759,1336.7557 198.97938,279.94679 203.96578,1350.786 190.55733,280.01913 35.88773,1339.6412 182.21857,278.83542 -128.65197,1303.5701 174.14937,276.4221 -285.97778,1243.3785 166.52998,272.83309 -432.5753,1160.4109 159.53061,268.14855 -565.16977,1056.5209 153.30761,262.47313 -680.79927,934.02902 147.99999,255.93361 -776.88081,795.67159 143.72632,248.67608 -851.2681,644.5393 140.58206,240.86264 -902.29944,484.00818 138.63746,232.66785 -928.83489,317.66423 137.93594,224.27476 -930.28167,149.2233 138.49318,215.87086 -906.60748,-17.551914 140.29674,207.64387 -858.34116,-178.93593 143.30632,199.77758 -786.56089,-331.3237 147.4547,192.4477 -692.87012,-471.31113 152.6492,185.81798 -579.36177,-595.77113 158.77379,180.03651 -448.5714,-701.92347 165.69166,175.23243 -303.42067,-787.39689 173.24828,171.51306 -147.15201,-850.28205 181.27483,168.9615 16.743816,-889.17419 189.59203,167.63472 184.60563,-903.20454 198.01408,167.56239 352.68368,-892.05967 206.35284,168.7461 517.22338,-855.98855 214.42204,171.15941 674.54919,-795.79694 222.04143,174.74843 821.14671,-712.82943 229.0408,179.43296 953.74118,-608.93938 235.2638,185.10838 1069.3707,-486.4475 240.57142,191.6479 1165.4522,-348.09008 244.84509,198.90544 1239.8395,-196.95779 247.98935,206.71887 1290.8709,-36.426664 249.93395,214.91366 1317.4063,129.91728 250.63547,223.30675 1318.8531,298.35821 250.07823,231.71066 1295.1789,465.13343 248.27467,239.93764 1246.9126,626.51744 245.26509,247.80393 1175.1323,778.90521 241.11672,255.13381 1081.4415,918.89264 235.92221,261.76353 967.93318,1043.3526 229.79762,267.54501 z"
|
||||
transform="matrix(0.70798902,0,0,0.70798902,662.44785,93.920802)" />
|
||||
d="M 837.14281,1149.505 200.00451,233.50242 691.99208,1234.9784 198.49319,234.24629 535.72342,1297.8636 196.88788,234.75661 371.82759,1336.7557 195.22444,235.02196 203.96578,1350.786 193.54003,235.03643 35.88773,1339.6412 191.87228,234.79969 -128.65197,1303.5701 190.25844,234.31702 -285.97778,1243.3785 188.73456,233.59922 -432.5753,1160.4109 187.33469,232.66231 -565.16977,1056.5209 186.09009,231.52723 -680.79927,934.02902 185.02856,230.21933 -776.88081,795.67159 184.17383,228.76782 -851.2681,644.5393 183.54498,227.20513 -902.29944,484.00818 183.15606,225.56617 -928.83489,317.66423 183.01575,223.88756 -930.28167,149.2233 183.1272,222.20678 -906.60748,-17.551914 183.48791,220.56138 -858.34116,-178.93593 184.08983,218.98812 -786.56089,-331.3237 184.9195,217.52215 -692.87012,-471.31113 185.9584,216.1962 -579.36177,-595.77113 187.18332,215.03991 -448.5714,-701.92347 188.5669,214.07909 -303.42067,-787.39689 190.07822,213.33522 -147.15201,-850.28205 191.68353,212.8249 16.743816,-889.17419 193.34697,212.55955 184.60563,-903.20454 195.03138,212.54508 352.68368,-892.05967 196.69913,212.78182 517.22338,-855.98855 198.31297,213.26449 674.54919,-795.79694 199.83685,213.98229 821.14671,-712.82943 201.23672,214.9192 953.74118,-608.93938 202.48132,216.05428 1069.3707,-486.4475 203.54285,217.36219 1165.4522,-348.09008 204.39758,218.81369 1239.8395,-196.95779 205.02643,220.37638 1290.8709,-36.426664 205.41535,222.01534 1317.4063,129.91728 205.55566,223.69396 1318.8531,298.35821 205.44421,225.37474 1295.1789,465.13343 205.0835,227.02013 1246.9126,626.51744 204.48158,228.59339 1175.1323,778.90521 203.65191,230.05937 1081.4415,918.89264 202.61301,231.38531 967.93318,1043.3526 201.38809,232.54161 z"
|
||||
transform="matrix(3.5590153,0,0,3.5590153,3314.7054,-3757.2057)" />
|
||||
</g>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
|
|
@ -11,6 +11,10 @@ window.requestAnimFrame = (function(){
|
|||
})();
|
||||
|
||||
|
||||
function now() {
|
||||
return new Date().getTime();
|
||||
}
|
||||
|
||||
function Flash(x, y) {
|
||||
this.el = $('<img class="backgroundflash" src="images/flash.png"/>');
|
||||
this.el.css('left', (x-10)+'px');
|
||||
|
|
@ -24,30 +28,70 @@ function Flash(x, y) {
|
|||
}
|
||||
|
||||
|
||||
function Raindrop(x, y, speedX) {
|
||||
this.lastUpdate = now();
|
||||
this.fadeUntil = now() + this.ttl;
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
this.speedX = speedX;
|
||||
this.speedY = 0;
|
||||
|
||||
this.el = $('<p class="backgroundraindrop"></p>');
|
||||
this.el.text(''+Math.floor(Math.random() * 2));
|
||||
$('body').append(this.el);
|
||||
this.render();
|
||||
}
|
||||
|
||||
Raindrop.prototype.ttl = 3000;
|
||||
|
||||
Raindrop.prototype.render = function() {
|
||||
var t = now();
|
||||
var d = (t - this.lastUpdate) / 1000;
|
||||
this.x += this.speedX * d;
|
||||
this.speedY += 9.81 * d;
|
||||
this.y += this.speedY * d;
|
||||
|
||||
this.el.css('left', Math.floor(this.x)+'px');
|
||||
this.el.css('top', Math.floor(this.y)+'px');
|
||||
this.el.css('opacity', (this.fadeUntil - t) / this.ttl);
|
||||
|
||||
this.lastUpdate = t;
|
||||
|
||||
var that = this;
|
||||
requestAnimFrame(function() {
|
||||
if (now() > that.fadeUntil)
|
||||
that.el.detach();
|
||||
else
|
||||
that.render();
|
||||
}, this.el[0]);
|
||||
};
|
||||
|
||||
|
||||
function Cloud() {
|
||||
this.lastUpdate = new Date().getTime();
|
||||
this.speedX = Math.random() * 200;
|
||||
this.lastUpdate = now();
|
||||
this.speedX = 10 + Math.random() * 50;
|
||||
if (Math.random() < 0.5) {
|
||||
this.x = -50;
|
||||
} else {
|
||||
this.speedX *= -1;
|
||||
this.x = $('body').innerWidth();
|
||||
}
|
||||
this.y = Math.floor(Math.random() * $('body').innerHeight());
|
||||
this.y = Math.floor(Math.random() / 2 * $('body').innerHeight());
|
||||
this.el = $('<img class="backgroundcloud" src="images/pixelcloud.png"/>');
|
||||
$('body').append(this.el);
|
||||
}
|
||||
|
||||
Cloud.prototype.update = function() {
|
||||
var now = new Date().getTime();
|
||||
this.x += this.speedX * (now - this.lastUpdate) / 1000;
|
||||
this.lastUpdate = now;
|
||||
this.x += this.speedX * (now() - this.lastUpdate) / 1000;
|
||||
this.lastUpdate = now();
|
||||
|
||||
this.el.css('left', Math.floor(this.x) + 'px');
|
||||
this.el.css('top', this.y + 'px');
|
||||
|
||||
if (this.isDone())
|
||||
this.el.detach();
|
||||
else if (this.raining && Math.random() < 0.1)
|
||||
new Raindrop(this.x + 8 + Math.random() * 48, this.y + 32, this.speedX);
|
||||
};
|
||||
|
||||
Cloud.prototype.isDone = function() {
|
||||
|
|
@ -57,7 +101,7 @@ Cloud.prototype.isDone = function() {
|
|||
|
||||
var clouds = [];
|
||||
function stepClouds() {
|
||||
if (clouds.length < 23 && Math.random() < 0.1)
|
||||
if (clouds.length < 12 && Math.random() < 0.05)
|
||||
clouds.push(new Cloud());
|
||||
|
||||
clouds = clouds.filter(function(cloud) {
|
||||
|
|
@ -71,9 +115,13 @@ function stepClouds() {
|
|||
cloud1.x < cloud2.x + 40 &&
|
||||
cloud1.y > cloud2.y - 72 &&
|
||||
cloud1.y < cloud2.y + 72 &&
|
||||
Math.random() < 0.01)
|
||||
Math.random() < 0.01) {
|
||||
|
||||
new Flash(Math.floor((cloud1.x + cloud2.x) / 2),
|
||||
Math.max(cloud1.y, cloud2.y) + 40);
|
||||
cloud1.raining = true;
|
||||
cloud2.raining = true;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ body {
|
|||
}
|
||||
#cloudy {
|
||||
background: url("../images/cloudy.png");
|
||||
position: relative;
|
||||
height: 231px;
|
||||
width: 264px;
|
||||
margin-right: -44.400000000000006pt;
|
||||
|
|
@ -81,75 +82,6 @@ p {
|
|||
}
|
||||
|
||||
|
||||
#solar {
|
||||
background-image: url('../images/sun.svg');
|
||||
z-index: -1000;
|
||||
overflow: visible;
|
||||
position: fixed;
|
||||
top: -800px;
|
||||
right: -800px;
|
||||
width: 1600px;
|
||||
height: 1600px;
|
||||
-webkit-animation: rotate 230s infinite linear;
|
||||
-moz-animation: rotate 230s infinite linear;
|
||||
-o-animation: rotate 230s infinite linear;
|
||||
-ms-animation: rotate 230s infinite linear;
|
||||
animation: rotate 230s infinite linear;
|
||||
}
|
||||
@-webkit-keyframes rotate {
|
||||
0% {
|
||||
-webkit-transform:rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
-webkit-transform:rotate(360deg);
|
||||
}
|
||||
}
|
||||
@-moz-keyframes rotate {
|
||||
0% {
|
||||
-moz-transform:rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
-moz-transform:rotate(360deg);
|
||||
}
|
||||
}
|
||||
@-o-keyframes rotate {
|
||||
0% {
|
||||
-o-transform:rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
-o-transform:rotate(360deg);
|
||||
}
|
||||
}
|
||||
@-ms-keyframes rotate {
|
||||
0% {
|
||||
-ms-transform:rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
-ms-transform:rotate(360deg);
|
||||
}
|
||||
}
|
||||
@keyframes rotate {
|
||||
0% {
|
||||
transform:rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
transform:rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
.backgroundcloud {
|
||||
position: fixed;
|
||||
width: 72px;
|
||||
height: 40px;
|
||||
z-index: -9;
|
||||
opacity: 0.4;
|
||||
}
|
||||
.backgroundflash {
|
||||
position: fixed;
|
||||
z-index: -8;
|
||||
opacity: 0.8;
|
||||
}
|
||||
|
||||
/*
|
||||
body {
|
||||
font-family: verdana, tahoma, helvetica, arial, sans-serif;
|
||||
|
|
@ -466,3 +398,78 @@ td.event {
|
|||
padding: 0 2em 0 0;
|
||||
}
|
||||
*/
|
||||
|
||||
#solar {
|
||||
background-image: url('../images/sun.svg');
|
||||
z-index: -1000;
|
||||
overflow: visible;
|
||||
position: absolute;
|
||||
top: -3900px;
|
||||
right: -3900px;
|
||||
width: 8000px;
|
||||
height: 8000px;
|
||||
-webkit-animation: rotate 230s infinite linear;
|
||||
-moz-animation: rotate 230s infinite linear;
|
||||
-o-animation: rotate 230s infinite linear;
|
||||
-ms-animation: rotate 230s infinite linear;
|
||||
animation: rotate 230s infinite linear;
|
||||
}
|
||||
@-webkit-keyframes rotate {
|
||||
0% {
|
||||
-webkit-transform:rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
-webkit-transform:rotate(360deg);
|
||||
}
|
||||
}
|
||||
@-moz-keyframes rotate {
|
||||
0% {
|
||||
-moz-transform:rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
-moz-transform:rotate(360deg);
|
||||
}
|
||||
}
|
||||
@-o-keyframes rotate {
|
||||
0% {
|
||||
-o-transform:rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
-o-transform:rotate(360deg);
|
||||
}
|
||||
}
|
||||
@-ms-keyframes rotate {
|
||||
0% {
|
||||
-ms-transform:rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
-ms-transform:rotate(360deg);
|
||||
}
|
||||
}
|
||||
@keyframes rotate {
|
||||
0% {
|
||||
transform:rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
transform:rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
.backgroundcloud {
|
||||
position: absolute;
|
||||
width: 72px;
|
||||
height: 40px;
|
||||
z-index: -9;
|
||||
}
|
||||
.backgroundflash {
|
||||
position: absolute;
|
||||
z-index: -7;
|
||||
}
|
||||
.backgroundraindrop {
|
||||
position: absolute;
|
||||
z-index: -8;
|
||||
color: #66f;
|
||||
font-family: monospace;
|
||||
font-size: 50%;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,10 @@
|
|||
</div>
|
||||
<div id="content">
|
||||
<div id="cloudy">
|
||||
<xsl:text> </xsl:text>
|
||||
<xsl:text> </xsl:text>
|
||||
<div id="solar">
|
||||
<xsl:text> </xsl:text>
|
||||
</div>
|
||||
</div>
|
||||
<xsl:call-template name="heading">
|
||||
<xsl:with-param name="title" select="$title"/>
|
||||
|
|
@ -259,9 +262,6 @@
|
|||
Copyleft 2004 - 2011, <a href="http://www.c3d2.de/">Chaos Computer Club Dresden</a> |
|
||||
<a href="mailto:mail@c3d2.de" title="eMail webmaster">mail@c3d2.de</a></div>
|
||||
</div>
|
||||
<div id="solar">
|
||||
<xsl:text> </xsl:text>
|
||||
</div>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="news-list">
|
||||
|
|
|
|||
Loading…
Reference in New Issue