fixed css ordering

This commit is contained in:
Galen Wolfe-Pauly 2016-05-18 22:48:27 -07:00
parent 88212812d5
commit 49b86157eb
4 changed files with 1381 additions and 1386 deletions

View File

@ -31,8 +31,7 @@
:: ;link(type "text/css", rel "stylesheet", href "//cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.min.css");
;* ?. nopack.dbg
:_ ~
;link(type "text/css", rel "stylesheet", href "/=home=/web/tree/~.main_codemirror_fonts_bootstrap.css");
:: ;link(type "text/css", rel "stylesheet", href "/=home=/web/tree/~.main_codemirror_bootstrap.css");
;link(type "text/css", rel "stylesheet", href "/=home=/web/tree/~.codemirror_fonts_bootstrap_main.css");
;=
;link(type "text/css", rel "stylesheet", href "/=home=/web/lib/css/fonts.css");
;link(type "text/css", rel "stylesheet", href "/=home=/web/lib/css/bootstrap.css");
@ -49,7 +48,7 @@
:: ;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.js");
:: ;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/libs/".
:: "codemirror/4.3.0/mode/markdown/markdown.min.js");
;* ?. nopack.dbg
;* ?. nopack.dbg
:_ ~
;script(type "text/javascript", src "{?.(aut "" "/~~")}".
"/~/at/=home=/web/tree/~.main_urb.js");

View File

@ -292,7 +292,7 @@ module.exports = recl({
},{}],5:[function(require,module,exports){
var Member, a, clas, div, h2, h3, label, pre, recl, ref, yaml,
var Member, a, clas, div, h2, h3, label, pre, recl, ref,
indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
clas = require('classnames');
@ -303,26 +303,6 @@ ref = React.DOM, div = ref.div, pre = ref.pre, a = ref.a, label = ref.label, h2
Member = require('./MemberComponent.coffee');
yaml = function(x, pad) {
var k, v;
if (pad == null) {
pad = "";
}
if ("object" !== typeof x) {
return "" + x;
} else {
return ((function() {
var results;
results = [];
for (k in x) {
v = x[k];
results.push("\n" + pad + k + ": " + (yaml(v, pad + " ")));
}
return results;
})()).join('');
}
};
module.exports = recl({
displayName: "Message",
lz: function(n) {
@ -359,8 +339,8 @@ module.exports = recl({
return this.props._handlePm(user);
},
renderSpeech: function(arg) {
var api, app, com, exp, fat, lin, mor, tax, url, x;
lin = arg.lin, app = arg.app, exp = arg.exp, tax = arg.tax, url = arg.url, mor = arg.mor, fat = arg.fat, api = arg.api, com = arg.com;
var app, com, exp, fat, lin, mor, tax, url, x;
lin = arg.lin, app = arg.app, exp = arg.exp, tax = arg.tax, url = arg.url, mor = arg.mor, fat = arg.fat, com = arg.com;
switch (false) {
case !(lin || app || exp || tax):
return (lin || app || exp || tax).txt;
@ -381,10 +361,6 @@ module.exports = recl({
return div({}, this.renderSpeech(fat.taf), div({
className: "fat"
}, this.renderTorso(fat.tor)));
case !api:
return div({}, a({
href: api.url
}, "[Piped data]"), pre({}, yaml(api)));
default:
return "Unknown speech type:" + ((function() {
var results;
@ -418,13 +394,11 @@ module.exports = recl({
}
},
classesInSpeech: function(arg) {
var api, app, exp, fat, lin, mor, url;
url = arg.url, api = arg.api, exp = arg.exp, app = arg.app, lin = arg.lin, mor = arg.mor, fat = arg.fat;
var app, exp, fat, lin, mor, url;
url = arg.url, exp = arg.exp, app = arg.app, lin = arg.lin, mor = arg.mor, fat = arg.fat;
switch (false) {
case !url:
return "url";
case !api:
return "api";
case !exp:
return "exp";
case !app:
@ -863,8 +837,6 @@ module.exports = recl({
_clas = clas({
open: this.state.open === station,
closed: !(this.state.open === station),
'col-md-4': true,
'col-md-offset-6': true,
menu: true,
'depth-2': true
});
@ -933,8 +905,6 @@ module.exports = recl({
_clas = clas({
open: this.props.open === true,
closed: this.props.open !== true,
'col-md-4': true,
'col-md-offset-2': true,
menu: true,
'depth-1': true
});
@ -2003,8 +1973,12 @@ if (!window.util) {
_.merge(window.util, {
defaultStation: function() {
var s;
if (document.location.search) {
return document.location.search.replace(/^\?/, '');
s = document.location.search.replace(/^\?/, '');
if (s.indexOf('dbg.nopack') !== -1) {
return window.util.mainStation();
}
} else {
return window.util.mainStation();
}

View File

@ -98,31 +98,46 @@ div.logo.inverse:before {
content: "\25D0"; }
@media (min-width: 768px) {
.menu,
.ctrl {
width: 180px; }
.ctrl.open,
.ctrl:hover {
max-width: 360px;
min-width: 180px;
width: auto; } }
width: auto; }
.menu.depth-1 {
margin-left: 180px; }
.menu.depth-2 {
margin-left: 360px; } }
@media (min-width: 992px) {
.menu,
.ctrl {
width: 235px; }
.ctrl.open,
.ctrl:hover {
max-width: 470px;
min-width: 235px;
width: auto; } }
width: auto; }
.menu.depth-1 {
margin-left: 235px; }
.menu.depth-2 {
margin-left: 470px; } }
@media (min-width: 1200px) {
.menu,
.ctrl {
width: 285px; }
.ctrl.open,
.ctrl:hover {
max-width: 570px;
min-width: 285px;
width: auto; } }
width: auto; }
.menu.depth-1 {
margin-left: 285px; }
.menu.depth-2 {
margin-left: 570px; } }
#head .loading {
display: none; }
@ -439,8 +454,8 @@ div.logo.inverse:before {
.urbit.navbar.ctrl {
margin-top: 1rem; }
.urbit.navbar.ctrl .icon .home {
border-color: #000;
background-color: #000;
border-color: #B1B7BD;
background-color: #B1B7BD;
width: 3rem;
height: 3rem;
margin: 0 4rem 0 0; }
@ -795,6 +810,8 @@ ol > li:before {
font-weight: 500; }
.body .urbit p.last {
margin-bottom: 2rem; }
.body .urbit p.email {
margin-top: 2rem; }
.body .urbit input.email {
font-weight: 500;
font-family: 'scp';
@ -1196,7 +1213,8 @@ ol > li:before {
#body.post h3.author {
padding-top: 0;
font-size: 1rem; }
font-size: 1rem;
font-weight: 200; }
#body.post h3.author:before {
content: "—";
@ -1217,25 +1235,15 @@ ol > li:before {
.urbit .post img,
.urbit.post h1.title,
.urbit.post img {
width: 600px;
width: 100%;
margin-bottom: 2rem; }
.urbit .post img,
.urbit.post img {
border: 12px solid #000; }
.urbit .post p.preview,
.urbit.post p.preview {
margin-bottom: .6rem;
max-width: 32rem; }
.urbit .post h3.author,
.urbit.post h3.author {
line-height: 1rem;
margin-bottom: 1rem; }
.urbit .post img {
max-width: 32rem; }
max-width: 24rem; }
.urbit.post .preview {
display: none; }
@ -1320,6 +1328,10 @@ ol > li:before {
padding: 0; }
.comments .comment p {
width: 66%; }
.comments .comment.loading {
color: #B1B7BD; }
.comments .comment.loading > span {
color: #eceeef; }
@media (max-width: 767px) {
.add-comment textarea,