git.iko.soy/urbit.org
on master help sign in
Merge branch 'master' of github.com:urbit/urbit.org
commit55aff2a2a13f21c7fb3430c0b6bc215a69faccb4 authorGalen Wolfe-Pauly <root@office-for.com> dateThu 5 May 2016, 17:06 (10 years ago) parent4b0933adf0ed00
2 files changed+13−3
compare with master
unifiedsplit
main.md+4−3 main/js/image-container.js+9
main.md+4−3
@@ -7,13 +7,15 @@ navpath: /main
77navhome: /main
88---
99
10+<script src="js/image-container.js"/>
11+
1012<div class="image-fs first">
1113 <div class="text-container">
1214 <div class="text">
1315 <h1><div class="logo"></div>Urbit</h1>
1416 </div>
1517 </div>
16− <div class="image-container" style="{backgroundImage:'url(\'http://urbit.s3.amazonaws.com/16-3-10/DSCF8655.jpg\')'}"></div>
18+ <image-container src="http://urbit.s3.amazonaws.com/16-3-10/DSCF8655.jpg" />
1719</div>
1820<!-- -->
1921<div class="container stack">
@@ -34,8 +36,7 @@ navhome: /main
3436 </div>
3537 </div>
3638 </div>
37− <div class="image-container" style="{backgroundImage:'url(\'http://urbit.s3.amazonaws.com/16-3-10/DSCF8653.jpg\')'}">
38− </div>
39+ <image-container src="http://urbit.s3.amazonaws.com/16-3-10/DSCF8653.jpg" />
3940</div>
4041<!-- -->
4142<div class="container stack six" id="learn">
main/js/image-container.jsnew file+9
@@ -0,0 +1,9 @@
1+window.tree.actions.registerComponent("image-container", React.createClass({
2+ displayName: "ImageContainer",
3+ render: function(){
4+ return React.DOM.div({
5+ className:"image-container",
6+ style:{backgroundImage:"url('"+this.props.src+"')"}
7+ });
8+ }
9+}))