diff --git a/static/style.css b/static/style.css index f08366a..5aeabe6 100644 --- a/static/style.css +++ b/static/style.css @@ -1,33 +1,16 @@ +.container { + width: 100%; + margin: 0; + padding: 0; +} + #intro { - margin-top: 2em; -} - -#logins { - margin-top: .3em; - text-align: right; -} - -#logo { - z-index: -1; -} - -@media (max-width: 600px) { - #logo { - float: left; - } - #header { - float: none; - width: 100%; - } -} - -#signups { - margin-top: 2em; -} - -#signups hr { - width: 50%; - border-color: lightgray; + width: 100%; + margin: 0; + margin-bottom: 2em; + padding: 1em; + background-color: #FFFFFF80; + /* TODO: box-shadow alpha to blend into topology */ } .big { @@ -42,30 +25,16 @@ font-size: .8em; } -#header br { - display: none; -} - -@media (min-width: 960px) { - #header br { - display: inline; - } -} - -#header p { - text-align: left; +#header { + text-align: right; } #title { font-weight: normal; } -#more-link { - font-size: .7em; -} - -body.about #more-link { - display: none; +#topology { + z-index: -1; } pre .keyword, code .keyword, code.keyword { @@ -91,6 +60,16 @@ pre .value, code .value, code.value { margin-bottom: 1em; } +#front-me { + text-align: left; + margin-left: 4em; +} + +#front-them { + text-align: right; + margin-right: 4em; +} + /* tentatively removed since it didn't look great with webmention signups */ /* @media (min-width: 768px) { */ /* #listen-signup, #listen-ui { */ @@ -244,13 +223,6 @@ label { font-weight: 300; } -/* Seems like this shouldn't be necessary, but cursor was ending up as auto on the - * a > img for the disabled Facebook signup button for some reason, not sure why. - */ -a > img { - cursor: pointer; -} - button { border: 0; background-color: #337AB7; /* same color as links */ @@ -436,6 +408,7 @@ input[type="submit"] { #footer { margin-top: 2em; margin-bottom: 1em; + margin-right: 1em; text-align: right; } diff --git a/static/topology.js b/static/topology.js index 0593407..e401b75 100644 --- a/static/topology.js +++ b/static/topology.js @@ -2,6 +2,8 @@ let sketch = function(p) { let width = 1400; let height = 900; let offset = 100; + let color = '#002222'; + let backgroundColor = '#FFFFFF'; let flow_cell_size = 10; @@ -20,7 +22,6 @@ let sketch = function(p) { let tick = 0; p.setup = function() { p.createCanvas(width, height); - p.background('#022'); p.smooth(); p.noStroke(); //p.blendMode(p.OVERLAY); @@ -121,7 +122,7 @@ let sketch = function(p) { function display_particles() { p.strokeWeight(2); - p.stroke(255, 240, 220, 5); + p.stroke(160, 180, 200, 5); for (let i = 0; i < particles.length; i++) { //p.stroke(particles[i].col); //p.point(particles[i].pos.x, particles[i].pos.y); @@ -147,14 +148,14 @@ let sketch = function(p) { } } - p.keyPressed = function() { - if (p.keyCode === 80) { - p.saveCanvas('landslide', 'jpeg'); - } - }; + // p.keyPressed = function() { + // if (p.keyCode === 80) { + // p.saveCanvas('landslide', 'jpeg'); + // } + // }; function mod(x, n) { return (x % n + n) % n; } }; -new p5(sketch); +new p5(sketch, document.getElementById('topology')); diff --git a/templates/base.html b/templates/base.html index 62f6bea..a0e6b2f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -10,7 +10,7 @@ - + @@ -34,21 +34,20 @@
- + - +
- -

{% block content %} {% endblock %} diff --git a/templates/index.html b/templates/index.html index aabd633..b86bff1 100644 --- a/templates/index.html +++ b/templates/index.html @@ -2,47 +2,21 @@ {% block content %} -
- What do you want to do? +
+ +
+I'm on + +
- + + {% endblock %}