diff --git a/website/source/javascripts/app/Engine.Particle.js b/website/source/javascripts/app/Engine.Particle.js index 9160b063a..180021dda 100644 --- a/website/source/javascripts/app/Engine.Particle.js +++ b/website/source/javascripts/app/Engine.Particle.js @@ -10,7 +10,8 @@ Engine.Particle = function(width, height){ this.pos = new Vector(0, 0); this.maxRadius = Engine.getRandomFloat(0.1, 2.5); - this.maxSpeed = Engine.getRandomFloat(0.01, 1000); + // this.maxSpeed = Engine.getRandomFloat(0.01, 1000); + this.maxSpeed = Engine.getRandomFloat(20, 1000); // Pick a random target side = Engine.getRandomInt(0, 3); diff --git a/website/source/javascripts/app/Engine.Point.Puller.js b/website/source/javascripts/app/Engine.Point.Puller.js new file mode 100644 index 000000000..22dc883c4 --- /dev/null +++ b/website/source/javascripts/app/Engine.Point.Puller.js @@ -0,0 +1,128 @@ +(function( + Engine, + Vector +){ + +Engine.Point.Puller = function(id, x, y){ + this.id = id; + this.pos.x = x; + this.pos.y = y; + + this.pos = Vector.coerce(this.pos); + this.home = this.pos.clone(); + this.accel = Vector.coerce(this.accel); + this.vel = Vector.coerce(this.vel); +}; + +Engine.Point.Puller.prototype = { + + fillStyle: null, + defaultFillstyle: '#b976ff', + chasingFillstyle: '#ff6b6b', + + radius: 1, + + maxSpeed: 160, + maxForce: 50, + + pos: { + x: 0, + y: 0 + }, + + accel: { + x: 0, + y: 0 + }, + + vel: { + x: 0, + y: 0 + }, + + aRad: 200, + + safety: 0.25, + + update: function(engine){ + var target = Vector.coerce(engine.mouse), + distanceToMouse = this.distanceTo(target), + toHome, mag, safety; + // distanceToHome = this.distanceTo(this.home); + + this.accel.mult(0); + + if (distanceToMouse < this.aRad) { + this._chasing = true; + this.toChase(target); + this.fillStyle = this.chasingFillstyle; + } else { + this._chasing = false; + this.fillStyle = this.defaultFillstyle; + } + + this.toChase(this.home, this.maxForce / 2); + + this.vel.add(this.accel); + this.pos.add( + Vector.mult(this.vel, engine.tick) + ); + + toHome = Vector.sub(this.home, this.pos); + mag = toHome.mag(); + safety = this.aRad * (this.safety * 3); + if (mag > this.aRad - safety) { + toHome.normalize(); + toHome.mult(this.aRad - safety); + this.pos = Vector.sub(this.home, toHome); + } + }, + + toChase: function(target, maxForce){ + var desired, steer, distance, mult, safety; + + maxForce = maxForce || this.maxForce; + + target = Vector.coerce(target); + desired = Vector.sub(target, this.pos); + distance = desired.mag(); + desired.normalize(); + + safety = this.aRad * this.safety; + + if (distance < safety) { + mult = Engine.map(distance, 0, safety, 0, this.maxSpeed); + } else if (distance > this.aRad - safety){ + mult = Engine.map(this.aRad - distance, 0, safety, 0, this.maxSpeed); + } else { + mult = this.maxSpeed; + } + + desired.mult(mult); + + steer = Vector.sub(desired, this.vel); + steer.limit(maxForce); + this.accel.add(steer); + }, + + draw: function(ctx, scale){ + ctx.fillStyle = this.fillStyle; + ctx.fillRect( + (this.pos.x - this.radius / 2) * scale >> 0, + (this.pos.y - this.radius / 2) * scale >> 0, + this.radius * scale, + this.radius * scale + ); + }, + + distanceTo: function(target) { + var xd = this.home.x - target.x; + var yd = this.home.y - target.y; + return Math.sqrt(xd * xd + yd * yd ); + } +}; + +})( + window.Engine, + window.Vector +); diff --git a/website/source/javascripts/app/Engine.Polygon.Puller.js b/website/source/javascripts/app/Engine.Polygon.Puller.js new file mode 100644 index 000000000..a6957b029 --- /dev/null +++ b/website/source/javascripts/app/Engine.Polygon.Puller.js @@ -0,0 +1,51 @@ +(function( + Engine, + Vector +){ + +Engine.Polygon.Puller = function(a, b, c, color, simple){ + this.a = a; + this.b = b; + this.c = c; + + this.strokeStyle = '#ffffff'; +}; + +Engine.Polygon.Puller.prototype = { + + checkChasing: function(){ + if ( + this.a._chasing === true && + this.b._chasing === true && + this.c._chasing === true + ) { + return true; + } + return false; + }, + + // Determine color fill? + update: function(engine){}, + + draw: function(ctx, scale){ + ctx.moveTo( + this.a.pos.x * scale >> 0, + this.a.pos.y * scale >> 0 + ); + ctx.lineTo( + this.b.pos.x * scale >> 0, + this.b.pos.y * scale >> 0 + ); + ctx.lineTo( + this.c.pos.x * scale >> 0, + this.c.pos.y * scale >> 0 + ); + ctx.lineTo( + this.a.pos.x * scale >> 0, + this.a.pos.y * scale >> 0 + ); + } + +}; + +})(window.Engine, window.Vector); diff --git a/website/source/javascripts/app/Engine.Polygon.js b/website/source/javascripts/app/Engine.Polygon.js index 1f5e63e7a..0b470dec2 100644 --- a/website/source/javascripts/app/Engine.Polygon.js +++ b/website/source/javascripts/app/Engine.Polygon.js @@ -84,8 +84,10 @@ Engine.Polygon.prototype = { this.c.pos.y * scale >> 0 ); ctx.closePath(); - ctx.fillStyle = this.fillStyle; - ctx.fill(); + if (!this.noFill) { + ctx.fillStyle = this.fillStyle; + ctx.fill(); + } if (!this.simple) { ctx.lineWidth = 0.25 * scale; ctx.strokeStyle = this.strokeStyle; diff --git a/website/source/javascripts/app/Engine.Shape.Puller.js b/website/source/javascripts/app/Engine.Shape.Puller.js new file mode 100644 index 000000000..2816b54ed --- /dev/null +++ b/website/source/javascripts/app/Engine.Shape.Puller.js @@ -0,0 +1,106 @@ +(function( + Engine, + Point, + Polygon, + Vector +){ + +Engine.Shape.Puller = function(x, y, width, height, points, polygons){ + var i, ref, point, poly; + + this.pos = new Vector(x, y); + this.size = new Vector(width, height); + + ref = {}; + this.points = []; + this.polygons = []; + + for (i = 0; i < points.length; i++) { + point = new Point( + points[i].id, + points[i].x * this.size.x, + points[i].y * this.size.y + ); + ref[point.id] = point; + this.points.push(point); + } + + for (i = 0; i < polygons.length; i++) { + poly = polygons[i]; + this.polygons.push(new Polygon( + ref[poly.points[0]], + ref[poly.points[1]], + ref[poly.points[2]], + poly.color + )); + this.polygons[this.polygons.length - 1].noFill = true; + } + + this.ref = undefined; +}; + +Engine.Shape.Puller.prototype = { + + alpha: 0, + + update: function(engine){ + var p; + + for (p = 0; p < this.points.length; p++) { + this.points[p].update(engine); + } + + for (p = 0; p < this.polygons.length; p++) { + this.polygons[p].update(engine); + } + + if (this.alpha < 0.2) { + this.alpha += 1 * engine.tick; + } + + return this; + }, + + draw: function(ctx, scale){ + var p; + + ctx.save(); + ctx.translate( + this.pos.x * scale >> 0, + this.pos.y * scale >> 0 + ); + ctx.beginPath(); + for (p = 0; p < this.polygons.length; p++) { + this.polygons[p].draw(ctx, scale); + } + ctx.closePath(); + ctx.lineWidth = 1 * scale; + ctx.strokeStyle = 'rgba(108,0,243,' + this.alpha + ')'; + ctx.stroke(); + + for (p = 0; p < this.points.length; p++) { + this.points[p].draw(ctx, scale); + } + + ctx.beginPath(); + for (p = 0; p < this.polygons.length; p++) { + if (this.polygons[p].checkChasing()) { + this.polygons[p].draw(ctx, scale); + } + } + ctx.closePath(); + ctx.fillStyle = 'rgba(108,0,243,0.1)'; + ctx.fill(); + + ctx.restore(); + return this; + } + +}; + +})( + window.Engine, + window.Engine.Point.Puller, + window.Engine.Polygon.Puller, + window.Vector +); diff --git a/website/source/javascripts/app/Engine.js b/website/source/javascripts/app/Engine.js index 324e666a6..83306aa82 100644 --- a/website/source/javascripts/app/Engine.js +++ b/website/source/javascripts/app/Engine.js @@ -5,6 +5,7 @@ Vector, Logo, Shapes, + Grid, Chainable ){ @@ -35,6 +36,13 @@ Engine = Base.extend({ _deferredParticles: [], _deferredShapes: [], + starGeneratorRate: 600, + + mouse: { + x: -9999, + y: -9999 + }, + constructor: function(canvas, image){ if (typeof canvas === 'string') { this.canvas = document.getElementById(canvas); @@ -59,6 +67,9 @@ Engine = Base.extend({ this.start = this.last; + this._handleMouseCoords = this._handleMouseCoords.bind(this); + window.addEventListener('mousemove', this._handleMouseCoords, false); + this.render = this.render.bind(this); this.render(); @@ -76,7 +87,15 @@ Engine = Base.extend({ image.style.opacity = 1; new Chainable() - .wait(3000) + .wait(2000) + .then(function(){ + this.starGeneratorRate = 100; + }, this) + .wait(2000) + .then(function(){ + this.showGrid = true; + }, this) + .wait(2000) .then(function(){ parent.className += ' state-one'; }) @@ -95,13 +114,16 @@ Engine = Base.extend({ .wait(100) .then(function(){ this.showShapes = true; + }, this) + .wait(1000) + .then(function(){ }, this); }, setupStarfield: function(){ this.particles = []; - this.generateParticles(50, true); - this.generateParticles(200); + // this.generateParticles(50, true); + this.generateParticles(1000); }, setupTessellation: function(canvas){ @@ -114,6 +136,15 @@ Engine = Base.extend({ Logo.Points, Logo.Polygons ); + + this.grid = new Engine.Shape.Puller( + -(this.width / 2), + -(this.height / 2), + this.width, + this.height * 1.5, + Grid.points, + Grid.polygons + ); }, render: function(){ @@ -137,6 +168,11 @@ Engine = Base.extend({ this.renderStarfield(this.now); + if (this.showGrid) { + this.grid.update(this); + this.grid.draw(this.context, scale); + } + if (this.showShapes) { this.renderTessellation(this.now); } @@ -250,7 +286,12 @@ Engine = Base.extend({ } } - this.generateParticles(200 * this.tick >> 0); + this.generateParticles(this.starGeneratorRate * this.tick >> 0); + }, + + _handleMouseCoords: function(event){ + this.mouse.x = event.pageX; + this.mouse.y = event.pageY; } }); @@ -282,5 +323,6 @@ window.Engine = Engine; window.Vector, window.Logo, window.Shapes, + window.Grid, window.Chainable ); diff --git a/website/source/javascripts/app/Grid.js b/website/source/javascripts/app/Grid.js new file mode 100644 index 000000000..2a6f938e1 --- /dev/null +++ b/website/source/javascripts/app/Grid.js @@ -0,0 +1,2117 @@ +var Grid = { + "data": { + "width": 1601, + "height": 993, + "ar": 0.6202373516552155 + }, + "points": [ + { + "id": "point-0", + "x": 0.14322298563397878, + "y": 0.0188632104934416 + }, + { + "id": "point-1", + "x": 0.04984384759525296, + "y": 0.07507807620237353 + }, + { + "id": "point-2", + "x": 0.15202998126171144, + "y": 0.10256089943785135 + }, + { + "id": "point-7", + "x": 0.21742660836976888, + "y": 0.05190505933791381 + }, + { + "id": "point-12", + "x": 0.34091193004372267, + "y": 0.00499687695190506 + }, + { + "id": "point-17", + "x": 0.21736414740787008, + "y": 0.1259837601499063 + }, + { + "id": "point-22", + "x": 0.2873204247345409, + "y": 0.06308557151780138 + }, + { + "id": "point-32", + "x": 0.32873204247345406, + "y": 0.10331043098063711 + }, + { + "id": "point-42", + "x": 0.40555902560899443, + "y": 0.07645221736414742 + }, + { + "id": "point-47", + "x": 0.4946283572767021, + "y": 0.00006246096189881324 + }, + { + "id": "point-52", + "x": 0.5602748282323547, + "y": 0.07951280449718927 + }, + { + "id": "point-57", + "x": 0.6095565271705184, + "y": 0.010368519675203 + }, + { + "id": "point-62", + "x": 0.7093066833229231, + "y": 0.04528419737663961 + }, + { + "id": "point-67", + "x": 0.852529668956902, + "y": 0.009056839475327922 + }, + { + "id": "point-72", + "x": 0.6542785758900687, + "y": 0.13360399750156154 + }, + { + "id": "point-77", + "x": 0.7742660836976889, + "y": 0.10543410368519679 + }, + { + "id": "point-82", + "x": 0.7868831980012492, + "y": 0.053029356652092456 + }, + { + "id": "point-92", + "x": 0.8560274828232355, + "y": 0.07913803872579639 + }, + { + "id": "point-102", + "x": 0.9703310430980637, + "y": 0.10543410368519679 + }, + { + "id": "point-106", + "x": 0.02229856339787633, + "y": 0.1997501561524048 + }, + { + "id": "point-112", + "x": 0.14328544659587758, + "y": 0.19587757651467835 + }, + { + "id": "point-122", + "x": 0.22342286071205497, + "y": 0.24253591505309188 + }, + { + "id": "point-127", + "x": 0.3110555902560899, + "y": 0.17539038101186763 + }, + { + "id": "point-142", + "x": 0.3754528419737664, + "y": 0.2044971892567146 + }, + { + "id": "point-147", + "x": 0.4637101811367895, + "y": 0.1989381636477202 + }, + { + "id": "point-152", + "x": 0.5165521549031855, + "y": 0.14740787008119927 + }, + { + "id": "point-162", + "x": 0.5850093691442848, + "y": 0.21692692067457844 + }, + { + "id": "point-177", + "x": 0.7033728919425358, + "y": 0.18738288569643974 + }, + { + "id": "point-187", + "x": 0.7677701436602123, + "y": 0.21742660836976893 + }, + { + "id": "point-192", + "x": 0.8801374141161773, + "y": 0.18226108682073708 + }, + { + "id": "point-208", + "x": 0.9807620237351655, + "y": 0.2017489069331668 + }, + { + "id": "point-212", + "x": 0, + "y": 0.28844472204871957 + }, + { + "id": "point-213", + "x": 0.11561524047470333, + "y": 0.27245471580262337 + }, + { + "id": "point-223", + "x": 0.18444722048719553, + "y": 0.3201124297314179 + }, + { + "id": "point-233", + "x": 0.29281698938163647, + "y": 0.31542785758900693 + }, + { + "id": "point-248", + "x": 0.40555902560899443, + "y": 0.29138038725796384 + }, + { + "id": "point-258", + "x": 0.49656464709556525, + "y": 0.30056214865708936 + }, + { + "id": "point-263", + "x": 0.5727670206121174, + "y": 0.28838226108682075 + }, + { + "id": "point-273", + "x": 0.6485946283572769, + "y": 0.3176139912554654 + }, + { + "id": "point-283", + "x": 0.7437851342910681, + "y": 0.28288569643972516 + }, + { + "id": "point-293", + "x": 0.8633978763272954, + "y": 0.30243597751405377 + }, + { + "id": "point-308", + "x": 0.9998126171143036, + "y": 0.300687070580887 + }, + { + "id": "point-312", + "x": 0.009868831980012493, + "y": 0.47101811367895075 + }, + { + "id": "point-313", + "x": 0.05921299188007495, + "y": 0.38869456589631485 + }, + { + "id": "point-323", + "x": 0.1324797001873829, + "y": 0.3617114303560276 + }, + { + "id": "point-333", + "x": 0.18232354778263585, + "y": 0.41711430356027485 + }, + { + "id": "point-343", + "x": 0.3008119925046846, + "y": 0.39693941286695816 + }, + { + "id": "point-348", + "x": 0.3870705808869457, + "y": 0.3713928794503436 + }, + { + "id": "point-358", + "x": 0.4925046845721424, + "y": 0.3724547158026234 + }, + { + "id": "point-368", + "x": 0.6081823860087445, + "y": 0.39687695190505934 + }, + { + "id": "point-383", + "x": 0.6968144909431605, + "y": 0.3900062460961899 + }, + { + "id": "point-393", + "x": 0.797626483447845, + "y": 0.3921299188007496 + }, + { + "id": "point-403", + "x": 0.8633978763272954, + "y": 0.4129294191130544 + }, + { + "id": "point-408", + "x": 0.9315427857589007, + "y": 0.36639600249843857 + }, + { + "id": "point-418", + "x": 0.9766396002498438, + "y": 0.49100562148657095 + }, + { + "id": "point-423", + "x": 0.09119300437226734, + "y": 0.4971267957526546 + }, + { + "id": "point-438", + "x": 0.21299188007495315, + "y": 0.4971267957526546 + }, + { + "id": "point-448", + "x": 0.34378513429106805, + "y": 0.4544659587757652 + }, + { + "id": "point-458", + "x": 0.43710181136789505, + "y": 0.5008744534665834 + }, + { + "id": "point-468", + "x": 0.524422236102436, + "y": 0.4815740162398502 + }, + { + "id": "point-478", + "x": 0.6131792629606496, + "y": 0.5098688319800125 + }, + { + "id": "point-483", + "x": 0.6606495940037476, + "y": 0.469269206745784 + }, + { + "id": "point-493", + "x": 0.7742660836976889, + "y": 0.5098688319800125 + }, + { + "id": "point-508", + "x": 0.891317926296065, + "y": 0.4853841349156777 + }, + { + "id": "point-522", + "x": 0.04984384759525296, + "y": 0.5787008119925048 + }, + { + "id": "point-528", + "x": 0.10855715178013742, + "y": 0.5830106183635229 + }, + { + "id": "point-538", + "x": 0.21742660836976888, + "y": 0.6202373516552155 + }, + { + "id": "point-543", + "x": 0.30087445346658337, + "y": 0.5400999375390382 + }, + { + "id": "point-553", + "x": 0.36820737039350404, + "y": 0.6108682073703936 + }, + { + "id": "point-563", + "x": 0.48107432854465965, + "y": 0.5948782011242973 + }, + { + "id": "point-578", + "x": 0.6131792629606496, + "y": 0.6108682073703936 + }, + { + "id": "point-583", + "x": 0.6974391005621485, + "y": 0.5910056214865711 + }, + { + "id": "point-598", + "x": 0.7570893191755153, + "y": 0.6108682073703936 + }, + { + "id": "point-603", + "x": 0.8850093691442847, + "y": 0.5844472204871956 + } + ], + "polygons": [ + { + "id": "poly-0", + "color": { + "h": 275.31428571428575, + "s": 100, + "l": 65.68627450980392, + "a": 1 + }, + "points": [ + "point-0", + "point-1", + "point-2" + ] + }, + { + "id": "poly-1", + "color": { + "h": 276.26373626373623, + "s": 100, + "l": 64.31372549019608, + "a": 1 + }, + "points": [ + "point-0", + "point-2", + "point-7" + ] + }, + { + "id": "poly-2", + "color": { + "h": 272.23404255319144, + "s": 100, + "l": 63.13725490196078, + "a": 1 + }, + "points": [ + "point-0", + "point-7", + "point-12" + ] + }, + { + "id": "poly-3", + "color": { + "h": 274.46808510638294, + "s": 100, + "l": 63.13725490196078, + "a": 1 + }, + "points": [ + "point-7", + "point-2", + "point-17" + ] + }, + { + "id": "poly-4", + "color": { + "h": 272.23404255319144, + "s": 100, + "l": 63.13725490196078, + "a": 1 + }, + "points": [ + "point-7", + "point-17", + "point-22" + ] + }, + { + "id": "poly-5", + "color": { + "h": 269.25373134328356, + "s": 100, + "l": 60.588235294117645, + "a": 1 + }, + "points": [ + "point-7", + "point-22", + "point-12" + ] + }, + { + "id": "poly-6", + "color": { + "h": 269.25373134328356, + "s": 100, + "l": 60.588235294117645, + "a": 1 + }, + "points": [ + "point-22", + "point-17", + "point-32" + ] + }, + { + "id": "poly-7", + "color": { + "h": 268.2692307692307, + "s": 100, + "l": 59.21568627450981, + "a": 1 + }, + "points": [ + "point-22", + "point-32", + "point-12" + ] + }, + { + "id": "poly-8", + "color": { + "h": 265.96153846153845, + "s": 100, + "l": 59.21568627450981, + "a": 1 + }, + "points": [ + "point-12", + "point-32", + "point-42" + ] + }, + { + "id": "poly-9", + "color": { + "h": 265.88235294117646, + "s": 86.4406779661017, + "l": 53.72549019607843, + "a": 1 + }, + "points": [ + "point-12", + "point-42", + "point-47" + ] + }, + { + "id": "poly-10", + "color": { + "h": 265.48387096774195, + "s": 76.22950819672131, + "l": 47.84313725490196, + "a": 1 + }, + "points": [ + "point-47", + "point-42", + "point-52" + ] + }, + { + "id": "poly-11", + "color": { + "h": 265.1933701657459, + "s": 83.41013824884793, + "l": 42.549019607843135, + "a": 1 + }, + "points": [ + "point-47", + "point-52", + "point-57" + ] + }, + { + "id": "poly-12", + "color": { + "h": 263.3532934131737, + "s": 91.2568306010929, + "l": 35.88235294117647, + "a": 1 + }, + "points": [ + "point-57", + "point-52", + "point-62" + ] + }, + { + "id": "poly-13", + "color": { + "h": 263.64963503649636, + "s": 100, + "l": 26.862745098039216, + "a": 1 + }, + "points": [ + "point-57", + "point-62", + "point-67" + ] + }, + { + "id": "poly-14", + "color": { + "h": 264.45859872611464, + "s": 96.31901840490798, + "l": 31.960784313725487, + "a": 1 + }, + "points": [ + "point-62", + "point-52", + "point-72" + ] + }, + { + "id": "poly-15", + "color": { + "h": 263.64963503649636, + "s": 100, + "l": 26.862745098039216, + "a": 1 + }, + "points": [ + "point-62", + "point-72", + "point-77" + ] + }, + { + "id": "poly-16", + "color": { + "h": 261.69230769230774, + "s": 100, + "l": 25.49019607843137, + "a": 1 + }, + "points": [ + "point-62", + "point-77", + "point-82" + ] + }, + { + "id": "poly-17", + "color": { + "h": 260, + "s": 100, + "l": 24.11764705882353, + "a": 1 + }, + "points": [ + "point-62", + "point-82", + "point-67" + ] + }, + { + "id": "poly-18", + "color": { + "h": 260, + "s": 100, + "l": 24.11764705882353, + "a": 1 + }, + "points": [ + "point-82", + "point-77", + "point-92" + ] + }, + { + "id": "poly-19", + "color": { + "h": 260, + "s": 100, + "l": 24.11764705882353, + "a": 1 + }, + "points": [ + "point-82", + "point-92", + "point-67" + ] + }, + { + "id": "poly-20", + "color": { + "h": 259.44444444444446, + "s": 100, + "l": 21.176470588235293, + "a": 1 + }, + "points": [ + "point-67", + "point-92", + "point-102" + ] + }, + { + "id": "poly-21", + "color": { + "h": 275.31428571428575, + "s": 100, + "l": 65.68627450980392, + "a": 1 + }, + "points": [ + "point-1", + "point-106", + "point-2" + ] + }, + { + "id": "poly-22", + "color": { + "h": 274.46808510638294, + "s": 100, + "l": 63.13725490196078, + "a": 1 + }, + "points": [ + "point-2", + "point-106", + "point-112" + ] + }, + { + "id": "poly-23", + "color": { + "h": 272.23404255319144, + "s": 100, + "l": 63.13725490196078, + "a": 1 + }, + "points": [ + "point-2", + "point-112", + "point-17" + ] + }, + { + "id": "poly-24", + "color": { + "h": 269.25373134328356, + "s": 100, + "l": 60.588235294117645, + "a": 1 + }, + "points": [ + "point-17", + "point-112", + "point-122" + ] + }, + { + "id": "poly-25", + "color": { + "h": 268.2692307692307, + "s": 100, + "l": 59.21568627450981, + "a": 1 + }, + "points": [ + "point-17", + "point-122", + "point-127" + ] + }, + { + "id": "poly-26", + "color": { + "h": 268.2692307692307, + "s": 100, + "l": 59.21568627450981, + "a": 1 + }, + "points": [ + "point-17", + "point-127", + "point-32" + ] + }, + { + "id": "poly-27", + "color": { + "h": 265.92233009708735, + "s": 92.7927927927928, + "l": 56.470588235294116, + "a": 1 + }, + "points": [ + "point-32", + "point-127", + "point-42" + ] + }, + { + "id": "poly-28", + "color": { + "h": 265.88235294117646, + "s": 86.4406779661017, + "l": 53.72549019607843, + "a": 1 + }, + "points": [ + "point-42", + "point-127", + "point-142" + ] + }, + { + "id": "poly-29", + "color": { + "h": 265.48387096774195, + "s": 76.22950819672131, + "l": 47.84313725490196, + "a": 1 + }, + "points": [ + "point-42", + "point-142", + "point-147" + ] + }, + { + "id": "poly-30", + "color": { + "h": 265.24590163934425, + "s": 79.22077922077922, + "l": 45.294117647058826, + "a": 1 + }, + "points": [ + "point-42", + "point-147", + "point-152" + ] + }, + { + "id": "poly-31", + "color": { + "h": 265.24590163934425, + "s": 79.22077922077922, + "l": 45.294117647058826, + "a": 1 + }, + "points": [ + "point-42", + "point-152", + "point-52" + ] + }, + { + "id": "poly-32", + "color": { + "h": 263.3532934131737, + "s": 91.2568306010929, + "l": 35.88235294117647, + "a": 1 + }, + "points": [ + "point-152", + "point-147", + "point-162" + ] + }, + { + "id": "poly-33", + "color": { + "h": 264.45859872611464, + "s": 96.31901840490798, + "l": 31.960784313725487, + "a": 1 + }, + "points": [ + "point-152", + "point-162", + "point-72" + ] + }, + { + "id": "poly-34", + "color": { + "h": 263.3532934131737, + "s": 91.2568306010929, + "l": 35.88235294117647, + "a": 1 + }, + "points": [ + "point-152", + "point-72", + "point-52" + ] + }, + { + "id": "poly-35", + "color": { + "h": 263.64963503649636, + "s": 100, + "l": 26.862745098039216, + "a": 1 + }, + "points": [ + "point-72", + "point-162", + "point-177" + ] + }, + { + "id": "poly-36", + "color": { + "h": 261.69230769230774, + "s": 100, + "l": 25.49019607843137, + "a": 1 + }, + "points": [ + "point-72", + "point-177", + "point-77" + ] + }, + { + "id": "poly-37", + "color": { + "h": 259.44444444444446, + "s": 100, + "l": 21.176470588235293, + "a": 1 + }, + "points": [ + "point-77", + "point-177", + "point-187" + ] + }, + { + "id": "poly-38", + "color": { + "h": 257.2277227722772, + "s": 100, + "l": 19.80392156862745, + "a": 1 + }, + "points": [ + "point-77", + "point-187", + "point-192" + ] + }, + { + "id": "poly-39", + "color": { + "h": 259.44444444444446, + "s": 100, + "l": 21.176470588235293, + "a": 1 + }, + "points": [ + "point-77", + "point-192", + "point-92" + ] + }, + { + "id": "poly-40", + "color": { + "h": 257.2277227722772, + "s": 100, + "l": 19.80392156862745, + "a": 1 + }, + "points": [ + "point-92", + "point-192", + "point-102" + ] + }, + { + "id": "poly-41", + "color": { + "h": 255.31914893617022, + "s": 100, + "l": 18.43137254901961, + "a": 1 + }, + "points": [ + "point-102", + "point-192", + "point-208" + ] + }, + { + "id": "poly-42", + "color": { + "h": 265.96153846153845, + "s": 100, + "l": 59.21568627450981, + "a": 1 + }, + "points": [ + "point-106", + "point-212", + "point-213" + ] + }, + { + "id": "poly-43", + "color": { + "h": 268.2692307692307, + "s": 100, + "l": 59.21568627450981, + "a": 1 + }, + "points": [ + "point-106", + "point-213", + "point-112" + ] + }, + { + "id": "poly-44", + "color": { + "h": 265.54455445544556, + "s": 80.8, + "l": 50.98039215686274, + "a": 1 + }, + "points": [ + "point-112", + "point-213", + "point-223" + ] + }, + { + "id": "poly-45", + "color": { + "h": 265.54455445544556, + "s": 80.8, + "l": 50.98039215686274, + "a": 1 + }, + "points": [ + "point-112", + "point-223", + "point-122" + ] + }, + { + "id": "poly-46", + "color": { + "h": 264.68571428571425, + "s": 91.62303664921467, + "l": 37.450980392156865, + "a": 1 + }, + "points": [ + "point-122", + "point-223", + "point-233" + ] + }, + { + "id": "poly-47", + "color": { + "h": 265.24590163934425, + "s": 79.22077922077922, + "l": 45.294117647058826, + "a": 1 + }, + "points": [ + "point-122", + "point-233", + "point-127" + ] + }, + { + "id": "poly-48", + "color": { + "h": 265.1933701657459, + "s": 83.41013824884793, + "l": 42.549019607843135, + "a": 1 + }, + "points": [ + "point-127", + "point-233", + "point-142" + ] + }, + { + "id": "poly-49", + "color": { + "h": 263.3532934131737, + "s": 91.2568306010929, + "l": 35.88235294117647, + "a": 1 + }, + "points": [ + "point-142", + "point-233", + "point-248" + ] + }, + { + "id": "poly-50", + "color": { + "h": 264.68571428571425, + "s": 91.62303664921467, + "l": 37.450980392156865, + "a": 1 + }, + "points": [ + "point-142", + "point-248", + "point-147" + ] + }, + { + "id": "poly-51", + "color": { + "h": 262.3448275862069, + "s": 100, + "l": 28.431372549019606, + "a": 1 + }, + "points": [ + "point-147", + "point-248", + "point-258" + ] + }, + { + "id": "poly-52", + "color": { + "h": 260, + "s": 100, + "l": 24.11764705882353, + "a": 1 + }, + "points": [ + "point-147", + "point-258", + "point-263" + ] + }, + { + "id": "poly-53", + "color": { + "h": 263.64963503649636, + "s": 100, + "l": 26.862745098039216, + "a": 1 + }, + "points": [ + "point-147", + "point-263", + "point-162" + ] + }, + { + "id": "poly-54", + "color": { + "h": 255.31914893617022, + "s": 100, + "l": 18.43137254901961, + "a": 1 + }, + "points": [ + "point-162", + "point-263", + "point-273" + ] + }, + { + "id": "poly-55", + "color": { + "h": 257.2277227722772, + "s": 100, + "l": 19.80392156862745, + "a": 1 + }, + "points": [ + "point-162", + "point-273", + "point-177" + ] + }, + { + "id": "poly-56", + "color": { + "h": 249.75, + "s": 100, + "l": 15.686274509803921, + "a": 1 + }, + "points": [ + "point-177", + "point-273", + "point-283" + ] + }, + { + "id": "poly-57", + "color": { + "h": 249.75, + "s": 100, + "l": 15.686274509803921, + "a": 1 + }, + "points": [ + "point-177", + "point-283", + "point-187" + ] + }, + { + "id": "poly-58", + "color": { + "h": 240, + "s": 100, + "l": 9.215686274509805, + "a": 1 + }, + "points": [ + "point-187", + "point-283", + "point-293" + ] + }, + { + "id": "poly-59", + "color": { + "h": 246.57534246575347, + "s": 100, + "l": 14.313725490196077, + "a": 1 + }, + "points": [ + "point-187", + "point-293", + "point-192" + ] + }, + { + "id": "poly-60", + "color": { + "h": 242.99999999999997, + "s": 100, + "l": 11.76470588235294, + "a": 1 + }, + "points": [ + "point-192", + "point-293", + "point-208" + ] + }, + { + "id": "poly-61", + "color": { + "h": 240, + "s": 100, + "l": 8.03921568627451, + "a": 1 + }, + "points": [ + "point-208", + "point-293", + "point-308" + ] + }, + { + "id": "poly-62", + "color": { + "h": 264.45859872611464, + "s": 96.31901840490798, + "l": 31.960784313725487, + "a": 1 + }, + "points": [ + "point-212", + "point-312", + "point-313" + ] + }, + { + "id": "poly-63", + "color": { + "h": 265.24590163934425, + "s": 79.22077922077922, + "l": 45.294117647058826, + "a": 1 + }, + "points": [ + "point-212", + "point-313", + "point-213" + ] + }, + { + "id": "poly-64", + "color": { + "h": 264.68571428571425, + "s": 91.62303664921467, + "l": 37.450980392156865, + "a": 1 + }, + "points": [ + "point-213", + "point-313", + "point-323" + ] + }, + { + "id": "poly-65", + "color": { + "h": 264.9438202247191, + "s": 87.25490196078431, + "l": 40, + "a": 1 + }, + "points": [ + "point-213", + "point-323", + "point-223" + ] + }, + { + "id": "poly-66", + "color": { + "h": 262.3448275862069, + "s": 100, + "l": 28.431372549019606, + "a": 1 + }, + "points": [ + "point-223", + "point-323", + "point-333" + ] + }, + { + "id": "poly-67", + "color": { + "h": 263.64963503649636, + "s": 100, + "l": 26.862745098039216, + "a": 1 + }, + "points": [ + "point-223", + "point-333", + "point-233" + ] + }, + { + "id": "poly-68", + "color": { + "h": 259.44444444444446, + "s": 100, + "l": 21.176470588235293, + "a": 1 + }, + "points": [ + "point-233", + "point-333", + "point-343" + ] + }, + { + "id": "poly-69", + "color": { + "h": 257.2277227722772, + "s": 100, + "l": 19.80392156862745, + "a": 1 + }, + "points": [ + "point-233", + "point-343", + "point-348" + ] + }, + { + "id": "poly-70", + "color": { + "h": 261.69230769230774, + "s": 100, + "l": 25.49019607843137, + "a": 1 + }, + "points": [ + "point-233", + "point-348", + "point-248" + ] + }, + { + "id": "poly-71", + "color": { + "h": 257.2277227722772, + "s": 100, + "l": 19.80392156862745, + "a": 1 + }, + "points": [ + "point-248", + "point-348", + "point-358" + ] + }, + { + "id": "poly-72", + "color": { + "h": 257.2277227722772, + "s": 100, + "l": 19.80392156862745, + "a": 1 + }, + "points": [ + "point-248", + "point-358", + "point-258" + ] + }, + { + "id": "poly-73", + "color": { + "h": 240, + "s": 100, + "l": 10.588235294117647, + "a": 1 + }, + "points": [ + "point-258", + "point-358", + "point-368" + ] + }, + { + "id": "poly-74", + "color": { + "h": 242.99999999999997, + "s": 100, + "l": 11.76470588235294, + "a": 1 + }, + "points": [ + "point-258", + "point-368", + "point-263" + ] + }, + { + "id": "poly-75", + "color": { + "h": 240, + "s": 100, + "l": 9.215686274509805, + "a": 1 + }, + "points": [ + "point-263", + "point-368", + "point-273" + ] + }, + { + "id": "poly-76", + "color": { + "h": 240, + "s": 100, + "l": 4.705882352941177, + "a": 1 + }, + "points": [ + "point-273", + "point-368", + "point-383" + ] + }, + { + "id": "poly-77", + "color": { + "h": 240, + "s": 100, + "l": 6.862745098039216, + "a": 1 + }, + "points": [ + "point-273", + "point-383", + "point-283" + ] + }, + { + "id": "poly-78", + "color": { + "h": 240, + "s": 100, + "l": 1.5686274509803921, + "a": 1 + }, + "points": [ + "point-283", + "point-383", + "point-393" + ] + }, + { + "id": "poly-79", + "color": { + "h": 240, + "s": 100, + "l": 2.549019607843137, + "a": 1 + }, + "points": [ + "point-283", + "point-393", + "point-293" + ] + }, + { + "id": "poly-80", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-293", + "point-393", + "point-403" + ] + }, + { + "id": "poly-81", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-293", + "point-403", + "point-408" + ] + }, + { + "id": "poly-82", + "color": { + "h": 240, + "s": 100, + "l": 1.5686274509803921, + "a": 1 + }, + "points": [ + "point-293", + "point-408", + "point-308" + ] + }, + { + "id": "poly-83", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-308", + "point-408", + "point-418" + ] + }, + { + "id": "poly-84", + "color": { + "h": 261.69230769230774, + "s": 100, + "l": 25.49019607843137, + "a": 1 + }, + "points": [ + "point-313", + "point-312", + "point-423" + ] + }, + { + "id": "poly-85", + "color": { + "h": 260, + "s": 100, + "l": 24.11764705882353, + "a": 1 + }, + "points": [ + "point-313", + "point-423", + "point-333" + ] + }, + { + "id": "poly-86", + "color": { + "h": 263.64963503649636, + "s": 100, + "l": 26.862745098039216, + "a": 1 + }, + "points": [ + "point-313", + "point-333", + "point-323" + ] + }, + { + "id": "poly-87", + "color": { + "h": 257.2277227722772, + "s": 100, + "l": 19.80392156862745, + "a": 1 + }, + "points": [ + "point-333", + "point-423", + "point-438" + ] + }, + { + "id": "poly-88", + "color": { + "h": 255.31914893617022, + "s": 100, + "l": 18.43137254901961, + "a": 1 + }, + "points": [ + "point-333", + "point-438", + "point-343" + ] + }, + { + "id": "poly-89", + "color": { + "h": 249.75, + "s": 100, + "l": 15.686274509803921, + "a": 1 + }, + "points": [ + "point-343", + "point-438", + "point-448" + ] + }, + { + "id": "poly-90", + "color": { + "h": 246.57534246575347, + "s": 100, + "l": 14.313725490196077, + "a": 1 + }, + "points": [ + "point-343", + "point-448", + "point-348" + ] + }, + { + "id": "poly-91", + "color": { + "h": 240, + "s": 100, + "l": 10.588235294117647, + "a": 1 + }, + "points": [ + "point-348", + "point-448", + "point-458" + ] + }, + { + "id": "poly-92", + "color": { + "h": 240, + "s": 100, + "l": 9.215686274509805, + "a": 1 + }, + "points": [ + "point-348", + "point-458", + "point-358" + ] + }, + { + "id": "poly-93", + "color": { + "h": 240, + "s": 100, + "l": 6.862745098039216, + "a": 1 + }, + "points": [ + "point-358", + "point-458", + "point-468" + ] + }, + { + "id": "poly-94", + "color": { + "h": 240, + "s": 100, + "l": 5.686274509803922, + "a": 1 + }, + "points": [ + "point-358", + "point-468", + "point-368" + ] + }, + { + "id": "poly-95", + "color": { + "h": 240, + "s": 100, + "l": 1.5686274509803921, + "a": 1 + }, + "points": [ + "point-368", + "point-468", + "point-478" + ] + }, + { + "id": "poly-96", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-368", + "point-478", + "point-483" + ] + }, + { + "id": "poly-97", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-368", + "point-483", + "point-383" + ] + }, + { + "id": "poly-98", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-383", + "point-483", + "point-493" + ] + }, + { + "id": "poly-99", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-383", + "point-493", + "point-393" + ] + }, + { + "id": "poly-100", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-393", + "point-493", + "point-403" + ] + }, + { + "id": "poly-101", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-403", + "point-493", + "point-508" + ] + }, + { + "id": "poly-102", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-403", + "point-508", + "point-408" + ] + }, + { + "id": "poly-103", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-408", + "point-508", + "point-418" + ] + }, + { + "id": "poly-104", + "color": { + "h": 259.44444444444446, + "s": 100, + "l": 21.176470588235293, + "a": 1 + }, + "points": [ + "point-312", + "point-522", + "point-423" + ] + }, + { + "id": "poly-105", + "color": { + "h": 257.2277227722772, + "s": 100, + "l": 19.80392156862745, + "a": 1 + }, + "points": [ + "point-423", + "point-522", + "point-528" + ] + }, + { + "id": "poly-106", + "color": { + "h": 257.2277227722772, + "s": 100, + "l": 19.80392156862745, + "a": 1 + }, + "points": [ + "point-423", + "point-528", + "point-438" + ] + }, + { + "id": "poly-107", + "color": { + "h": 252.41379310344828, + "s": 100, + "l": 17.058823529411764, + "a": 1 + }, + "points": [ + "point-438", + "point-528", + "point-538" + ] + }, + { + "id": "poly-108", + "color": { + "h": 246.57534246575347, + "s": 100, + "l": 14.313725490196077, + "a": 1 + }, + "points": [ + "point-438", + "point-538", + "point-543" + ] + }, + { + "id": "poly-109", + "color": { + "h": 246.57534246575347, + "s": 100, + "l": 14.313725490196077, + "a": 1 + }, + "points": [ + "point-438", + "point-543", + "point-448" + ] + }, + { + "id": "poly-110", + "color": { + "h": 240, + "s": 100, + "l": 9.215686274509805, + "a": 1 + }, + "points": [ + "point-448", + "point-543", + "point-553" + ] + }, + { + "id": "poly-111", + "color": { + "h": 240, + "s": 100, + "l": 9.215686274509805, + "a": 1 + }, + "points": [ + "point-448", + "point-553", + "point-458" + ] + }, + { + "id": "poly-112", + "color": { + "h": 240, + "s": 100, + "l": 5.686274509803922, + "a": 1 + }, + "points": [ + "point-458", + "point-553", + "point-563" + ] + }, + { + "id": "poly-113", + "color": { + "h": 240, + "s": 100, + "l": 5.686274509803922, + "a": 1 + }, + "points": [ + "point-458", + "point-563", + "point-468" + ] + }, + { + "id": "poly-114", + "color": { + "h": 240, + "s": 100, + "l": 1.5686274509803921, + "a": 1 + }, + "points": [ + "point-468", + "point-563", + "point-478" + ] + }, + { + "id": "poly-115", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-478", + "point-563", + "point-578" + ] + }, + { + "id": "poly-116", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-478", + "point-578", + "point-583" + ] + }, + { + "id": "poly-117", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-478", + "point-583", + "point-483" + ] + }, + { + "id": "poly-118", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-483", + "point-583", + "point-493" + ] + }, + { + "id": "poly-119", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-493", + "point-583", + "point-598" + ] + }, + { + "id": "poly-120", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-493", + "point-598", + "point-603" + ] + }, + { + "id": "poly-121", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-493", + "point-603", + "point-508" + ] + }, + { + "id": "poly-122", + "color": { + "h": 0, + "s": 0, + "l": 0, + "a": 1 + }, + "points": [ + "point-508", + "point-603", + "point-418" + ] + }, + { + "id": "poly-123", + "color": { + "h": 240, + "s": 100, + "l": 9.215686274509805, + "a": 1 + }, + "points": [ + "point-538", + "point-553", + "point-543" + ] + } + ] +}; diff --git a/website/source/layouts/_footer.erb b/website/source/layouts/_footer.erb index 3d97c1417..83e8ad1ff 100644 --- a/website/source/layouts/_footer.erb +++ b/website/source/layouts/_footer.erb @@ -28,12 +28,16 @@ + + + + diff --git a/website/source/stylesheets/_header.less b/website/source/stylesheets/_header.less index 76ad142c2..8fc7abfc1 100755 --- a/website/source/stylesheets/_header.less +++ b/website/source/stylesheets/_header.less @@ -56,6 +56,8 @@ body.page-sub{ margin-bottom: 0; &.navbar-static-top{ + height:70px; + -webkit-transform:translate3d(0,0,0); -moz-transform:translate3d(0,0,0); -ms-transform:translate3d(0,0,0); diff --git a/website/source/stylesheets/_jumbotron.less b/website/source/stylesheets/_jumbotron.less index 490e180b3..afd13266a 100755 --- a/website/source/stylesheets/_jumbotron.less +++ b/website/source/stylesheets/_jumbotron.less @@ -3,7 +3,7 @@ // -------------------------------------------------- #jumbotron-mask{ - overflow: hidden; + position:relative; height: @jumbotron-total-height; margin-top: @negative-hero-margin; background-color: black; diff --git a/website/source/stylesheets/_variables.less b/website/source/stylesheets/_variables.less index 8f580124b..56ed68cfa 100755 --- a/website/source/stylesheets/_variables.less +++ b/website/source/stylesheets/_variables.less @@ -12,7 +12,7 @@ @jumbotron-color: #fff; @btn-border-radius: 4px; @el-border-radius: 6px; -@negative-hero-margin: -90px; +@negative-hero-margin: -70px; // colors // ------------------------- diff --git a/website/source/stylesheets/main.css b/website/source/stylesheets/main.css index 1422bafcf..7a8da3900 100644 --- a/website/source/stylesheets/main.css +++ b/website/source/stylesheets/main.css @@ -126,6 +126,7 @@ body.page-sub #header .main-links.nav > li > a:focus { margin-bottom: 0; } #header.navbar-static-top { + height: 70px; -webkit-transform: translate3d(0, 0, 0); -moz-transform: translate3d(0, 0, 0); -ms-transform: translate3d(0, 0, 0); @@ -579,9 +580,9 @@ body.page-home #footer { } } #jumbotron-mask { - overflow: hidden; + position: relative; height: 700px; - margin-top: -90px; + margin-top: -70px; background-color: black; } #jumbotron {