Merge branch 'test' of https://github.com/galenwp/urbit into karpi

This commit is contained in:
C. Guy Yarvin 2015-10-19 14:15:01 -07:00
commit f08c934db5
7 changed files with 50 additions and 26 deletions

2
docs/hymn.hook Normal file
View File

@ -0,0 +1,2 @@
/: /%%%/tree/pub/docs /% /hymn/
-<

2
docs/json.hook Normal file
View File

@ -0,0 +1,2 @@
/: /%%%/tree/pub/docs /% /json/
-<

View File

@ -53,14 +53,13 @@
line-height 2.6rem
a
line-height 1.6rem
line-height 1rem
.mono
font-size 1.3rem
.footer
margin 4rem 0 4rem 0
font-weight 200
line-height 1rem
color #ccc
p
margin 0
code
@ -100,19 +99,18 @@
:-ms-input-placeholder
color #e6e7e8
button
&.submit
font inherit
border 0
background-color #fff
border-bottom 3px solid #000
font-size 1.6rem
line-height 1.6rem
display inline-block
text-align left
margin-top 1rem
height 2rem
padding 0 .6rem
button.submit
font inherit
border 0
background-color #fff
border-bottom 3px solid #000
font-size 1.6rem
line-height 1.6rem
display inline-block
text-align left
margin-top 1rem
height 2rem
padding 0 .6rem
li::before
content ''
@ -132,10 +130,13 @@
margin-left 1em
.kids h2,
div.footer
font-family 'scp'
font-size .7rem
@media only screen and (max-width: 1170px)
#cont.lead
top 0rem
@media only screen and (min-width: 320px) and (max-width: 1024px)
#cont.lead
top 0rem
@ -149,6 +150,7 @@
h1.leader,
h1.fold
font-size 1.6rem
line-height 3rem
margin-left 0
.list li,
@ -157,6 +159,12 @@
font-size 1rem
line-height 1.6rem
button.submit
font-size 1rem
.mono
font-size .7rem
.date,
div.footer
font-size .6rem

View File

@ -79,6 +79,7 @@ pre,
li:before,
.spin,
#bred a,
.mono,
h3.time {
font-family: "scp", "Courier New", courier, monospace;
}
@ -612,14 +613,13 @@ h2.date {
line-height: 2.6rem;
}
#cont.lead a {
line-height: 1.6rem;
line-height: 1rem;
}
#cont.lead .mono {
font-size: 1.3rem;
}
#cont.lead .footer {
margin: 4rem 0 4rem 0;
font-weight: 200;
line-height: 1rem;
color: #ccc;
}
#cont.lead .footer p {
margin: 0;
@ -693,11 +693,15 @@ h2.date {
content: "\2014";
margin-left: 1em;
}
#cont.lead .kids h2,
#cont.lead div.footer {
#cont.lead .kids h2 {
font-family: 'scp';
font-size: 0.7rem;
}
@media only screen and (max-width: 1170px) {
#cont.lead {
top: 0rem;
}
}
@media only screen and (min-width: 320px) and (max-width: 1024px) {
#cont.lead {
top: 0rem;
@ -711,6 +715,7 @@ h2.date {
#cont.lead h1.leader,
#cont.lead h1.fold {
font-size: 1.6rem;
line-height: 3rem;
margin-left: 0;
}
#cont.lead .list li,
@ -719,6 +724,12 @@ h2.date {
font-size: 1rem;
line-height: 1.6rem;
}
#cont.lead button.submit {
font-size: 1rem;
}
#cont.lead .mono {
font-size: 0.7rem;
}
#cont.lead .date,
#cont.lead div.footer {
font-size: 0.6rem;

View File

@ -9,6 +9,7 @@ pre
li:before
.spin
#bred a
.mono
h3.time
font-family "scp","Courier New",courier,monospace

View File

@ -38,7 +38,7 @@ module.exports = recl
if @state.submit is false
cont = [
(input {key:"field",className:"email",placeholder:"your@email.com",@onKeyUp}, @state.email)
(button {key:"submit",className:"submit",@onClick}, "Go")
(button {key:"submit",className:"submit",@onClick}, "Sign up")
]
else
cont = [(div {className:"submitted"},"Got it. Thanks!")]

View File

@ -585,7 +585,7 @@ module.exports = recl({
key: "submit",
className: "submit",
onClick: this.onClick
}, "Go")
}, "Sign up")
];
} else {
cont = [