urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 20:02:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'galen/spam' into pending

Browse Source
This commit is contained in:
Philip C Monk 2015-11-04 18:36:22 -05:00
commit c8bd8446e6
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pub/docs/dev/hoon/tutorial/0-nouns.mdy
View File

@ -1,6 +1,7 @@
--- ---
title: Hoon 101.0: nouns, spans, and molds title: Hoon 101.0: nouns, spans, and molds
sort: 0 sort: 0
spam: true
next: true next: true
--- ---

2
pub/tree/src/js/components/BodyComponent.coffee
View File

@ -57,7 +57,7 @@ module.exports = query {
render: -> render: ->
className = (@props.meta.layout?.replace /,/g," ") || "" className = (@props.meta.layout?.replace /,/g," ") || ""
body = [reactify @props.body] body = [reactify @props.body]
if document.location.hostname is 'urbit.org' if document.location.hostname is 'urbit.org' and @props.meta.spam?
body.unshift (Spam {}, "") body.unshift (Spam {}, "")
if @props.meta.logo? if @props.meta.logo?
body.unshift (Logo color:@props.meta.logo) body.unshift (Logo color:@props.meta.logo)

2
pub/tree/src/js/main.js
View File

@ -519,7 +519,7 @@ module.exports = query({
var body, className, ref1; var body, className, ref1;
className = ((ref1 = this.props.meta.layout) != null ? ref1.replace(/,/g, " ") : void 0) || ""; className = ((ref1 = this.props.meta.layout) != null ? ref1.replace(/,/g, " ") : void 0) || "";
body = [reactify(this.props.body)]; body = [reactify(this.props.body)];
if (document.location.hostname === 'urbit.org') { if (document.location.hostname === 'urbit.org' && (this.props.meta.spam != null)) {
body.unshift(Spam({}, "")); body.unshift(Spam({}, ""));
} }
if (this.props.meta.logo != null) { if (this.props.meta.logo != null) {