Merge remote-tracking branch 'galenwp/org'

tree@aca2211
This commit is contained in:
Raymond Pasco 2016-04-27 22:29:52 -04:00
commit d607f968d5
3 changed files with 375 additions and 289 deletions

File diff suppressed because one or more lines are too long

View File

@ -15,26 +15,26 @@ img.logo.first {
margin-bottom: 2rem; }
div.logo {
width: 3rem;
height: 3rem;
background-color: #fff;
width: 4rem;
height: 4rem;
background-color: #000;
display: inline-block;
margin-right: 1rem;
border-radius: 50%;
vertical-align: middle;
margin-top: -.8rem;
background-color: #000; }
margin-top: -.8rem; }
div.logo:before {
content: "~";
color: #B1B7BD;
font-size: 2.6rem;
color: #FFFFFF;
font-size: 4rem;
vertical-align: middle;
line-height: 3rem;
margin-top: .2rem;
text-align: center;
width: 2rem;
display: inline-block; }
display: inline-block;
font-weight: 200; }
div.logo.inverse:before {
color: #fff; }
@ -178,7 +178,11 @@ div.logo.inverse:before {
position: relative;
margin-bottom: 3rem;
padding: 0;
background-color: transparent; }
background-color: transparent;
width: auto; }
.ctrl.navbar,
.ctrl.navbar .items {
height: 3rem; }
.ctrl.navbar .icon,
.ctrl.navbar ul.nav,
.ctrl.navbar li {
@ -230,7 +234,9 @@ div.logo.inverse:before {
width: inherit;
max-width: inherit; }
.ctrl.open {
max-height: 12rem; }
height: auto;
max-height: 12rem;
min-height: 3rem; }
a.nav-link {
font-size: 1rem;
line-height: 1rem;
@ -374,8 +380,7 @@ div.logo.inverse:before {
content: "~";
color: #fff;
line-height: .8rem;
font-size: 1.4rem;
padding-left: 1px; }
font-size: 1.4rem; }
@media (max-width: 991px) {
[data-path^='/docs'] .home:before,
@ -433,9 +438,6 @@ div.logo.inverse:before {
.urbit.navbar.ctrl {
margin-top: 1rem; }
.urbit.navbar.ctrl,
.urbit.navbar.ctrl .items {
height: 3rem; }
.urbit.navbar.ctrl .icon .home {
border-color: #B1B7BD;
background-color: #B1B7BD;
@ -452,13 +454,16 @@ div.logo.inverse:before {
display: inline-block; }
.urbit.navbar.ctrl ul.nav li {
height: 3rem;
vertical-align: middle; }
vertical-align: middle;
min-width: 0;
margin-right: 2rem; }
.urbit.navbar.ctrl ul.nav li a {
text-decoration: none;
color: #B1B7BD;
color: #000;
font-weight: 500;
font-size: 1rem;
line-height: 3rem; }
border-bottom: 3px solid #000;
margin-top: 1rem; }
.urbit.navbar.ctrl ul.nav .btn {
border: 3px solid #000;
margin-top: -3px;
@ -476,7 +481,8 @@ div.logo.inverse:before {
color: #fff; }
.urbit.navbar.ctrl ul.nav li a:hover,
.urbit.navbar.ctrl ul.nav li.selected a {
color: #000; }
color: #55595c;
border-color: #55595c; }
.urbit.navbar.ctrl .subnav ul.nav {
height: 1.5rem; }
.urbit.navbar.ctrl .subnav ul.nav li {
@ -497,45 +503,60 @@ div.logo.inverse:before {
.urbit.home.navbar.ctrl .icon .home:before {
color: #B1B7BD; }
.urbit.home.navbar.ctrl ul.nav li a {
color: #f7f7f9; }
.urbit.home.navbar.ctrl ul li a {
color: #fff;
border-color: #fff; }
@media (max-width: 767px) {
.urbit.navbar.ctrl .icon {
margin-top: .5rem;
margin-bottom: .5rem; }
.urbit.navbar.ctrl .icon .home {
width: 2rem;
height: 2rem;
margin: 0; }
.urbit.navbar.ctrl .icon .home:before {
font-size: 1.6rem;
line-height: 1.8rem;
width: 1.6rem; }
.urbit.navbar.ctrl .navbar-toggler {
margin-top: .5rem;
margin-left: 1rem; }
.urbit.navbar.ctrl ul.nav,
.urbit.navbar.ctrl .subnav ul.nav {
overflow: visible;
.urbit.home.navbar.ctrl .icon .home {
display: none; }
.urbit.navbar.ctrl {
height: auto;
margin-left: 3rem;
float: left; }
.urbit.navbar.ctrl ul.nav li,
.urbit.navbar.ctrl .subnav ul.nav li {
display: block;
height: 1.5rem; }
.urbit.navbar.ctrl ul.nav li a,
.urbit.navbar.ctrl .subnav ul.nav li a {
line-height: 1.5rem; }
.urbit.navbar.ctrl ul.nav li.btn,
.urbit.navbar.ctrl .subnav ul.nav li.btn {
height: 1.5rem;
border: 0; }
.urbit.navbar.ctrl ul.nav li.btn a,
.urbit.navbar.ctrl .subnav ul.nav li.btn a {
color: #64DE79;
line-height: 1.5rem; } }
margin: 0;
position: absolute;
border: none; }
.urbit.navbar.ctrl .icon {
margin-top: 1rem;
margin-bottom: .5rem; }
.urbit.navbar.ctrl .icon .home {
width: 18px;
height: 18px;
margin: 0 1rem 0 0; }
.urbit.navbar.ctrl .icon .home:before {
font-size: 1rem;
line-height: .7rem;
width: .6rem; }
.urbit.navbar.ctrl .icon .navbar-toggler {
margin-left: 0; }
.urbit.navbar.ctrl .icon .navbar-toggler,
.urbit.navbar.ctrl .icon .open .navbar-toggler {
opacity: 1; }
.urbit.navbar.ctrl ul.nav,
.urbit.navbar.ctrl .subnav ul.nav {
overflow: visible;
background-color: #fff;
height: auto;
margin-left: -1rem;
padding-left: 1rem;
padding-top: .8rem;
float: left; }
.urbit.navbar.ctrl ul.nav li,
.urbit.navbar.ctrl .subnav ul.nav li {
display: block;
height: 1.5rem; }
.urbit.navbar.ctrl ul.nav li a,
.urbit.navbar.ctrl .subnav ul.nav li a {
line-height: 1.5rem;
margin-top: 0;
color: #000; }
.urbit.navbar.ctrl ul.nav li.btn,
.urbit.navbar.ctrl .subnav ul.nav li.btn {
height: 1.5rem;
border: 0; }
.urbit.navbar.ctrl ul.nav li.btn a,
.urbit.navbar.ctrl .subnav ul.nav li.btn a {
color: #64DE79;
line-height: 1.5rem; } }
#tree > div > .container {
padding-top: 3rem;
@ -581,6 +602,26 @@ div.logo.inverse:before {
border-bottom: 2px solid #55595c;
margin-left: .6rem; }
ol {
counter-reset: li;
list-style: none;
padding-left: 2rem; }
ol > li {
margin-bottom: 2rem; }
.top ol {
padding-left: 0; }
ol > li:before {
content: counter(li) ".";
counter-increment: li;
text-align: left;
font-weight: 500;
float: left;
margin-right: 1rem;
margin-left: -2rem; }
.body[data-path^='/docs'] h1,
.body[data-path^='/work'] h1 {
color: #000; }
@ -627,181 +668,199 @@ div.logo.inverse:before {
padding-top: 0;
margin-bottom: 0; }
.body .urbit .logo {
background-color: #fff; }
.body .urbit h1 {
color: #000;
line-height: 4rem; }
.body .urbit a.green:hover {
color: #64DE79; }
.body .urbit .container.stack {
margin-bottom: 3rem; }
.body .urbit .container.stack p {
font-size: 1.2rem;
line-height: 2rem; }
.body .urbit .container.stack.six {
margin-top: 12rem;
margin-bottom: 6rem; }
.body .urbit .btn.black {
text-transform: none;
text-decoration: none;
border: 3px solid #000;
letter-spacing: 0;
margin-right: 1rem; }
.body .urbit button.submit:hover,
.body .urbit .btn.black:hover {
background-color: #000;
color: #fff; }
.body .urbit .front {
padding-bottom: 4rem; }
.body .urbit .front h1 {
padding-top: 0; }
.body .urbit .front h1,
.body .urbit .front h1 a {
font-size: 4rem;
line-height: 6rem; }
.body .urbit .image-fs {
height: 44rem;
margin-bottom: 3rem; }
.body .urbit .image-fs .text-container,
.body .urbit .image-fs .image-container {
position: absolute; }
.body .urbit .image-fs .text-container {
display: table;
height: 44rem;
width: 100%;
z-index: 1; }
.body .urbit .image-fs .text-container .text {
display: table-cell;
vertical-align: middle; }
.body .urbit .image-fs .text-container .rect {
width: 60%;
margin-left: auto;
margin-right: auto; }
.body .urbit .image-fs .text-container .rect h1 {
padding-bottom: 1rem;
text-align: left; }
.body .urbit .image-fs .text-container .rect.no-header {
font-weight: 500;
color: #fff;
font-size: 1.4rem; }
.body .urbit .image-fs .text-container .rect.no-header p.email {
font-size: 1rem; }
.body .urbit .image-fs .text-container .rect.no-header button.submit {
background-color: transparent;
border-color: #fff; }
.body .urbit .image-fs .image-container {
z-index: 0;
height: 44rem;
width: 100%;
overflow: hidden; }
.body .urbit .image-fs .image-container img {
position: relative;
left: 50%;
margin-left: -50%;
top: 50%;
margin-top: -50%;
min-height: 44rem;
min-width: 100%; }
.body .urbit .image-fs h1 {
text-align: center;
.body .urbit {
padding-bottom: 9rem; }
.body .urbit .logo {
background-color: transparent;
border: .3rem solid #fff; }
.body .urbit .logo:before {
line-height: 3.4rem; }
.body .urbit h1 {
color: #000;
line-height: 4rem; }
.body .urbit a.green:hover {
color: #64DE79; }
.body .urbit .container.stack {
margin-bottom: 3rem; }
.body .urbit .container.stack p {
font-size: 1.2rem;
line-height: 2rem; }
.body .urbit .container.stack.six {
margin-top: 12rem;
margin-bottom: 6rem; }
.body .urbit .btn.black {
text-transform: none;
text-decoration: none;
border: 3px solid #000;
letter-spacing: 0;
margin: 0 1rem 1rem 0; }
.body .urbit button.submit:hover,
.body .urbit .btn.black:hover {
background-color: #000;
color: #fff; }
.body .urbit .image-fs.first {
margin-top: -9rem; }
.body .urbit .slide {
margin-bottom: 12rem;
position: relative; }
.body .urbit .slide h1 {
padding-bottom: 1rem; }
.body .urbit .slide .pair {
display: table; }
.body .urbit .slide .pair .text,
.body .urbit .slide .pair .image {
display: table-cell;
vertical-align: middle; }
.body .urbit .slide .pair .image.right {
padding-left: 5%; }
.body .urbit .slide .pair .image.left {
padding-right: 5%; }
.body .urbit .slide .pair .text {
width: 75%; }
.body .urbit .slide .pair .image {
width: 20%; }
.body .urbit .slide .pair p:last-child {
margin-bottom: 0; }
.body .urbit .end {
padding: 1rem;
background-color: #64DE79;
color: white;
text-decoration: none;
font-size: 2rem;
font-weight: 500; }
.body .urbit input.email,
.body .urbit button.submit {
line-height: 1rem;
padding: .6rem;
border: 0; }
.body .urbit input.email {
font-weight: 500;
background-color: #B1B7BD;
color: #fff;
margin-right: 1rem;
border: 3px solid #B1B7BD; }
.body .urbit input.email::-moz-placeholder {
color: #D2D2D2; }
.body .urbit input.email::-webkit-input-placeholder {
color: #D2D2D2; }
.body .urbit button.submit {
text-transform: none;
text-decoration: none;
border: 3px solid #000;
background-color: #fff;
font-weight: 500;
letter-spacing: 0; }
.body .urbit .last a {
display: block;
font-weight: 500;
color: #B1B7BD; }
.body .urbit .last h2 {
padding-top: 0;
padding-bottom: 1rem;
margin-bottom: 0; }
.body .urbit.home p.email {
margin-top: 3rem; }
.body .urbit .front {
padding-bottom: 4rem; }
.body .urbit .front h1 {
padding-top: 0; }
.body .urbit .front h1,
.body .urbit .front h1 a {
font-size: 4rem;
line-height: 6rem; }
.body .urbit .image-fs {
height: 44rem;
margin-bottom: 3rem; }
.body .urbit .image-fs .text-container,
.body .urbit .image-fs .image-container {
position: absolute; }
.body .urbit .image-fs .text-container {
display: table;
height: 44rem;
width: 100%;
z-index: 1; }
.body .urbit .image-fs .text-container .text {
display: table-cell;
vertical-align: middle; }
.body .urbit .image-fs .text-container .rect {
margin-left: auto;
margin-right: auto; }
.body .urbit .image-fs .text-container .rect h1 {
padding-bottom: 1rem;
text-align: left; }
@media (min-width: 544px) {
.body .urbit .image-fs .text-container .rect {
width: 480px; } }
@media (min-width: 768px) {
.body .urbit .image-fs .text-container .rect {
width: 600px; } }
@media (min-width: 992px) {
.body .urbit .image-fs .text-container .rect {
width: 783.33333px; } }
@media (min-width: 1200px) {
.body .urbit .image-fs .text-container .rect {
width: 950px; } }
.body .urbit .image-fs .text-container .rect {
padding: 0 30px 0 30px; }
.body .urbit .image-fs .text-container .rect.no-header {
font-weight: 500;
color: #fff;
font-size: 1.4rem; }
.body .urbit .image-fs .text-container .rect.no-header p.email {
font-size: 1rem; }
.body .urbit .image-fs .image-container {
z-index: 0;
height: 44rem;
width: 100%;
overflow: hidden;
background-repeat: no-repeat;
background-position: center center;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover; }
.body .urbit .image-fs h1 {
text-align: center;
color: #fff; }
.body .urbit .image-fs.first {
margin-top: -9rem; }
.body .urbit .image-fs.first h1 {
padding-bottom: 0; }
.body .urbit .slide {
margin-bottom: 12rem;
position: relative; }
.body .urbit .slide h1 {
padding-bottom: 1rem; }
.body .urbit .slide .pair {
display: table; }
.body .urbit .slide .pair .text,
.body .urbit .slide .pair .image {
display: table-cell;
vertical-align: middle; }
.body .urbit .slide .pair .image.right {
padding-left: 5%; }
.body .urbit .slide .pair .image.left {
padding-right: 5%; }
.body .urbit .slide .pair .text {
width: 75%; }
.body .urbit .slide .pair .image {
width: 20%; }
.body .urbit .slide .pair p:last-child {
margin-bottom: 0; }
.body .urbit .end {
padding: 1rem;
background-color: #64DE79;
color: white;
text-decoration: none;
font-size: 2rem;
font-weight: 500; }
.body .urbit input.email {
font-weight: 500;
background-color: #000;
color: #fff;
font-size: 1rem;
margin-right: 1rem;
border: 3px solid #000;
padding: .375rem 1rem;
margin: 0 1rem 0 0;
line-height: 1.6rem;
vertical-align: top;
margin-bottom: .6rem; }
.body .urbit input.email::-moz-placeholder {
color: #D2D2D2; }
.body .urbit input.email::-webkit-input-placeholder {
color: #D2D2D2; }
.body .urbit button.submit {
text-transform: none;
text-decoration: none;
background-color: #000000;
color: #fff;
font-weight: 500;
letter-spacing: 0; }
.body .urbit .last a {
display: block;
font-weight: 500;
color: #55595c;
line-height: 2rem; }
.body .urbit .last h2 {
padding-top: 0;
padding-bottom: 1rem;
margin-bottom: 0; }
.body .urbit .fade-out {
background: -webkit-linear-gradient(top, rgba(153, 153, 153, 0) 0%, white 100%);
background: linear-gradient(to bottom, rgba(153, 153, 153, 0) 0%, white 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00999999', endColorstr='#ffffff',GradientType=0 );
margin-top: -14rem;
position: absolute;
height: 12rem;
width: 100%; }
.body .urbit .grams {
margin: 2rem 0; }
.body .urbit .grams .gram label {
background-color: #000; }
.body .urbit .grams .gram .speech {
font-size: 1.6rem; }
.body .urbit .grams .gram .iden,
.body .urbit .grams .gram .path {
max-width: 12rem;
white-space: nowrap;
overflow: hidden;
vertical-align: middle; }
@media (max-width: 767px) {
.body .urbit {
margin-top: 4rem; }
.body .urbit .slide .pair,
.body .urbit .slide .pair .text,
.body .urbit .slide .pair .image {
display: block;
width: 100%; }
.body .urbit .slide .pair .image {
text-align: center; }
.body .urbit .slide .pair .image.left {
margin-bottom: 2rem; }
.body .urbit .slide .pair .image.right {
margin-top: 2rem; } }
.body .urbit .slide .pair,
.body .urbit .slide .pair .text,
.body .urbit .slide .pair .image {
display: block;
width: 100%; }
.body .urbit .slide .pair .image {
text-align: center; }
.body .urbit .slide .pair .image.left {
margin-bottom: 2rem; }
.body .urbit .slide .pair .image.right {
margin-top: 2rem; }
.body .urbit .last .col-md-4 {
margin-top: 2rem; }
.body .urbit .last .col-md-4.col-md-offset-1 {
margin-top: 0; } }
@media (max-width: 767px) {
#body.plan {
@ -922,7 +981,7 @@ div.logo.inverse:before {
padding-right: 0;
position: fixed;
overflow: hidden;
z-index: 99;
z-index: 101;
margin-top: -3rem; }
.menu .contents {
padding-left: 0.9375rem;
@ -1007,6 +1066,10 @@ div.logo.inverse:before {
font-weight: 500;
font-size: 1.4rem; }
.list.post .date {
font-family: 'scp';
font-size: .7rem; }
.body[data-path^='/docs'] .list,
.body[data-path^='/work'] .list {
list-style-type: none;
@ -1051,13 +1114,15 @@ div.logo.inverse:before {
.body[data-path^='/docs'] .list.runes a h1 {
display: block;
margin-bottom: .3rem;
height: 1.8rem; }
height: auto;
border-bottom: none; }
.body[data-path^='/docs'] .list.runes a h1 code {
background-color: transparent;
font-weight: 500;
font-size: 1.2rem;
padding: 0; }
padding: 0;
border-bottom: 2px solid #000; }
.body[data-path^='/docs'] .list.runes a code {
background-color: #eceeef; }
@ -1070,15 +1135,14 @@ div.logo.inverse:before {
padding-left: 0; }
.urbit ul.blog li {
margin-bottom: 12rem; }
.urbit ul.blog .btn {
padding: .3rem;
border: 3px solid #64DE79;
color: #64DE79;
.urbit ul.blog .continue {
font-weight: 500;
text-decoration: none;
text-transform: none; }
.urbit ul.blog .btn:hover {
background-color: #64DE79;
color: #fff; }
border-bottom: 3px solid #000; }
@media (max-width: 767px) {
.urbit ul.blog li {
margin-bottom: 6rem; } }
.kids.runes h1 {
padding-top: 3rem; }
@ -1096,13 +1160,26 @@ div.logo.inverse:before {
.kids.runes > div p:first-of-type {
font-weight: 500; }
.urbit .post .date,
.urbit.post .date {
#body.post .date {
font-family: 'scp';
color: #B1B7BD;
font-size: .7rem;
font-weight: 200; }
#body.post .date,
#body.post p.preview,
#body.post h3.author {
margin-bottom: .6rem; }
#body.post h3.author {
padding-top: 0;
font-size: 1rem;
font-weight: 200; }
#body.post h3.author:before {
content: "—";
margin-right: .6rem; }
.urbit .post h1.title,
.urbit .post p.preview,
.urbit.post h1.title,
@ -1121,24 +1198,9 @@ div.logo.inverse:before {
width: 100%;
margin-bottom: 2rem; }
.urbit .post .date,
.urbit .post p.preview,
.urbit .post h3.author,
.urbit.post .date,
.urbit.post p.preview,
.urbit.post h3.author {
margin-bottom: .6rem; }
.urbit .post h3.author,
.urbit.post h3.author {
padding-top: 0;
font-size: 1rem;
font-weight: 200; }
.urbit .post h3:before,
.urbit.post h3:before {
content: "—";
margin-right: .6rem; }
.urbit .post img,
.urbit.post img {
border: 12px solid #000; }
.urbit.post .preview {
max-width: 75%; }

View File

@ -426,9 +426,11 @@ extras = {
className: footerClas,
key: 'footer-inner'
}, [
"This page was served by an Urbit.", a({
"This page was made by Urbit. ", a({
href: "urbit.org"
}, "urbit.org"), a({
href: "mailto:urbit@urbit.org"
}, "urbit@urbit.org")
}, "contact")
])
]);
}
@ -488,6 +490,9 @@ module.exports = query({
}
innerClas = clas(innerClas);
bodyClas = clas((ref1 = this.props.meta.layout) != null ? ref1.split(',') : void 0);
if (this.props.meta.type && bodyClas.indexOf(this.props.meta.type) === -1) {
bodyClas += " " + this.props.meta.type;
}
parts = [
extra('spam'), extra('logo', {
color: this.props.meta.logo
@ -795,7 +800,7 @@ module.exports = recl({
value: this.state.email
}), button({
key: "submit",
className: "submit",
className: "submit btn",
onClick: this.onClick
}, submit)
];
@ -950,7 +955,7 @@ module.exports = query({
}, 'Error: Empty path'), div({}, pre({}, this.props.path), span({}, 'is either empty or does not exist.')));
},
renderList: function() {
var _date, _k, _keys, author, cont, date, elem, href, i, image, item, k, len, linked, node, parts, path, preview, ref1, ref2, ref3, ref4, ref5, ref6, results, sorted, title, v;
var _date, _k, _keys, author, date, elem, href, i, image, item, k, len, linked, node, parts, path, preview, ref1, ref2, ref3, ref4, ref5, ref6, results, sorted, title, v;
sorted = true;
_keys = [];
ref1 = this.props.kids;
@ -1002,13 +1007,31 @@ module.exports = query({
parts = [];
title = null;
if ((ref6 = elem.meta) != null ? ref6.title : void 0) {
title = {
gn: 'h1',
ga: {
className: 'title'
},
c: [elem.meta.title]
};
if (this.props.dataType === 'post') {
title = {
gn: 'a',
ga: {
href: href
},
c: [
{
gn: 'h1',
ga: {
className: 'title'
},
c: [elem.meta.title]
}
]
};
} else {
title = {
gn: 'h1',
ga: {
className: 'title'
},
c: [elem.meta.title]
};
}
}
if (!title && elem.head.c.length > 0) {
title = elem.head;
@ -1041,10 +1064,18 @@ module.exports = query({
if (this.props.dataType === 'post') {
if (elem.meta.image) {
image = {
gn: 'img',
gn: 'a',
ga: {
src: elem.meta.image
}
href: href
},
c: [
{
gn: 'img',
ga: {
src: elem.meta.image
}
}
]
};
parts.push(image);
}
@ -1078,15 +1109,6 @@ module.exports = query({
};
parts.push(author);
}
cont = {
gn: 'a',
ga: {
className: 'btn continue',
href: href
},
c: ['Continue reading']
};
parts.push(cont);
linked = true;
}
}
@ -1811,11 +1833,19 @@ Virtual = recl({
}, function(str) {
return str;
}, function(arg, key) {
var c, ga, gn, props, ref1;
var c, e, error, ga, gn, props, ref1;
gn = arg.gn, ga = arg.ga, c = arg.c;
props = {
key: key
};
if (ga != null ? ga.style : void 0) {
try {
ga.style = eval("(" + ga.style + ")");
} catch (error) {
e = error;
ga.style = ga.style;
}
}
if (components[gn]) {
props.basePath = basePath;
}
@ -2102,7 +2132,7 @@ module.exports = query({
}, a({
className: "nav-link",
href: href,
onClick: _this.props.toggleNav
onClick: _this.props.closeNav
}, head));
};
})(this)));