From ac0ee5f3f0af294e2483c6d2e13bd482786bd002 Mon Sep 17 00:00:00 2001 From: Galen Wolfe-Pauly Date: Thu, 4 Feb 2016 17:38:14 -0800 Subject: [PATCH] in-between tree commits --- web/lib/css/bootstrap.css | 32 ++++++++++---------------------- web/static.md | 4 ++++ web/tree/main.js | 19 +++++++++++-------- 3 files changed, 25 insertions(+), 30 deletions(-) diff --git a/web/lib/css/bootstrap.css b/web/lib/css/bootstrap.css index f6fbf162f..7e8bbf292 100644 --- a/web/lib/css/bootstrap.css +++ b/web/lib/css/bootstrap.css @@ -6064,20 +6064,20 @@ textarea:focus { } } -.body { - padding-left: 1.875rem; +.red { + color: #ff0808; } -@media (max-width: 543px) { - .body { - padding-left: .9375rem; - } +.green { + color: #61e000; } -@media (max-width: 767px) { - .body { - margin-top: 4rem; - } +.yellow { + color: #fff900; +} + +.blue { + color: #0500f0; } .action { @@ -6121,24 +6121,12 @@ h2.advice { color: #b1b7bd; } -p.ship { - white-space: nowrap; -} - -input#ship { - width: 66.7%; -} - .sig, #ship, #pass { font-size: 2rem; } -.sig { - margin-right: .3rem; -} - #pass { width: 100%; } diff --git a/web/static.md b/web/static.md index 5dab1b28b..12e980193 100644 --- a/web/static.md +++ b/web/static.md @@ -1,3 +1,7 @@ +--- +comments: true +--- + # Static You can put static files in here to serve them to the web. Actually, you can put static files anywhere in `/web` and see them in a browser. diff --git a/web/tree/main.js b/web/tree/main.js index 22d3c1294..656a5a28a 100644 --- a/web/tree/main.js +++ b/web/tree/main.js @@ -145,9 +145,7 @@ Nav = React.createFactory(query({ return dt = this.ts - Number(Date.now()); }, _home: function() { - if (document.location.pathname !== "/") { - return document.location = "/"; - } + return this.props.goTo("/"); }, toggleFocus: function(state) { return $(ReactDOM.findDOMNode(this)).toggleClass('focus', state); @@ -324,6 +322,7 @@ module.exports = query({ curr: this.props.name, dataPath: this.props.sein, sein: this.props.sein, + goTo: this.goTo, key: "nav" }, "div") ]; @@ -598,8 +597,7 @@ module.exports = query({ }, recl({ displayName: "Body", render: function() { - var className, extra, ref1; - className = clas((ref1 = this.props.meta.layout) != null ? ref1.split(',') : void 0); + var bodyClas, containerClas, extra, ref1; extra = (function(_this) { return function(name, props) { if (props == null) { @@ -610,12 +608,18 @@ module.exports = query({ } }; })(this); + containerClas = { + "col-md-10": true, + "col-md-offset-2": this.props.meta.anchor !== 'none', + body: true + }; + bodyClas = clas((ref1 = this.props.meta.layout) != null ? ref1.split(',') : void 0); return div({ - className: "col-md-10 col-md-offset-2 body" + className: containerClas }, [ div({ key: "body" + this.props.path, - className: className + bodyClas: bodyClas }, extra('spam'), extra('logo', { color: this.props.meta.logo }), reactify(this.props.body), extra('next', { @@ -690,7 +694,6 @@ module.exports = React.createFactory(recl({ displayName: "Dpad", renderUp: function() { if (this.props.sein) { - console.log(util.basepath(this.props.sein)); return this.renderArrow("up", this.props.sein); } },