on master help sign in
clean up and merge
commit64fe563e24b091ef4a08f0eb80c2c92290ada3bc authorGalen Wolfe-Pauly <root@office-for.com> dateThu 5 May 2016, 17:22 (10 years ago) parent55aff2a
2 files changed+4−16
main.md+4−7 main/js/image-container.js−9
main.md+4−7
@@ -7,15 +7,13 @@ navpath: /main
77navhome: /main
88---
99
10−<script src="js/image-container.js"/>
11−
1210<div class="image-fs first">
1311 <div class="text-container">
1412 <div class="text">
1513 <h1><div class="logo"></div>Urbit</h1>
1614 </div>
1715 </div>
18− <image-container src="http://urbit.s3.amazonaws.com/16-3-10/DSCF8655.jpg" />
16+ <imagepanel src="http://urbit.s3.amazonaws.com/16-3-10/DSCF8655.jpg" />
1917</div>
2018<!-- -->
2119<div class="container stack">
@@ -36,7 +34,7 @@ navhome: /main
3634 </div>
3735 </div>
3836 </div>
39− <image-container src="http://urbit.s3.amazonaws.com/16-3-10/DSCF8653.jpg" />
37+ <imagepanel src="http://urbit.s3.amazonaws.com/16-3-10/DSCF8653.jpg" />
4038</div>
4139<!-- -->
4240<div class="container stack six" id="learn">
@@ -45,7 +43,7 @@ navhome: /main
4543 <div class="slide">
4644 <h1>Urbit is a new layer</h1>
4745 <p>Your Urbit is your digital identity, permanent personal archive, general-purpose computing platform and secure network of devices. The convenience of cloud computing is fantastic, but it need not come at the cost of our security, control and creativity.</p>
48− <p>Read more in our <a>overview post</a> and <a>mission statement</a>.</p>
46+ <p>Read more in our <a>overview post</a>&#32; and <a>mission statement</a>.</p>
4947 </div>
5048 <!-- -->
5149 <div class="slide">
@@ -87,8 +85,7 @@ navhome: /main
8785 </div>
8886 </div>
8987</div>
90−<div class="image-container" style="{backgroundImage:'url(\'http://urbit.s3.amazonaws.com/16-3-10/DSCF8654.jpg\')'}">
91−</div>
88+<imagepanel src="http://urbit.s3.amazonaws.com/16-3-10/DSCF8654.jpg" />
9289</div>
9390<!-- -->
9491<div class="container stack last">
main/js/image-container.jsdeleted−9
@@ -1,9 +0,0 @@
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−}))