git.iko.soy/urbit.org
on master help sign in
clean up and merge
64fe563Galen Wolfe-Pauly
main.md+4−7
compare with master
unifiedsplit
@@ -7,15 +7,13 @@ navpath: /main
7navhome: /main
7navhome: /main
8---
8---
9
9
10−<script src="js/image-container.js"/>
11−
12<div class="image-fs first">
10<div class="image-fs first">
13 <div class="text-container">
11 <div class="text-container">
14 <div class="text">
12 <div class="text">
15 <h1><div class="logo"></div>Urbit</h1>
13 <h1><div class="logo"></div>Urbit</h1>
16 </div>
14 </div>
17 </div>
15 </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" />
19</div>
17</div>
20<!-- -->
18<!-- -->
21<div class="container stack">
19<div class="container stack">
@@ -36,7 +34,7 @@ navhome: /main
36 </div>
34 </div>
37 </div>
35 </div>
38 </div>
36 </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" />
40</div>
38</div>
41<!-- -->
39<!-- -->
42<div class="container stack six" id="learn">
40<div class="container stack six" id="learn">
@@ -45,7 +43,7 @@ navhome: /main
45 <div class="slide">
43 <div class="slide">
46 <h1>Urbit is a new layer</h1>
44 <h1>Urbit is a new layer</h1>
47 <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>
45 <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>
49 </div>
47 </div>
50 <!-- -->
48 <!-- -->
51 <div class="slide">
49 <div class="slide">
@@ -87,8 +85,7 @@ navhome: /main
87 </div>
85 </div>
88 </div>
86 </div>
89</div>
87</div>
90−<div class="image-container" style="{backgroundImage:'url(\'http://urbit.s3.amazonaws.com/16-3-10/DSCF8654.jpg\')'}">
88+<imagepanel src="http://urbit.s3.amazonaws.com/16-3-10/DSCF8654.jpg" />
91−</div>
92</div>
89</div>
93<!-- -->
90<!-- -->
94<div class="container stack last">
91<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−}))