git ssb - Merge branch 'spacing' of https://github.com/clehner/patchbay into invite

modules/about.jsView
		@@ -15,9 +15,9 @@
15	15	var id = msg.value.content.about
16	16	return h('p',
17	17	about.about === msg.value.author
18	18	? h('span', 'self-identifies')
19		- : h('span', 'identifies', idLink(id)),
	19	+ : h('span', 'identifies ', idLink(id)),
20	20	' as ',
21	21	h('a', {href:"#/"+about.about},
22	22	about.name \|\| null,
23	23	about.image

modules/follow.jsView
		@@ -7,9 +7,9 @@
7	7	//render a message when someone follows someone,
8	8	//so you see new users
9	9	exports.message_content = function (msg) {
10	10
11		- if(msg.value.content.type == 'contact') {
	11	+ if(msg.value.content.type == 'contact' && msg.value.content.contact) {
12	12	return h('div.contact',
13	13	'follows',
14	14	avatar(msg.value.content.contact)
15	15	)
		@@ -79,9 +79,9 @@
79	79	following: !you_follow
80	80	}, function (err) {
81	81	//TODO: update after following.
82	82	})
83		- }}, label)
	83	+ }}, h('br'), label)
84	84	)
85	85	}
86	86
87	87

modules/names.jsView
		@@ -42,14 +42,14 @@
42	42	if (err) return console.error(err)
43	43	getAvatar({links: sbot_links}, me.id, id,
44	44	function (err, avatar) {
45	45	if (err) return console.error(err)
46		- n.textContent = avatar.name
	46	+ n.textContent = (avatar.name[0] == '@' ? '' : '@') + avatar.name
47	47	})
48	48	})
49	49
50	50	n.textContent = names.reduce(function (max, item) {
51		- return max.count > item.count ? max : item
	51	+ return max.count > item.count \|\| item.name == '@' ? max : item
52	52	}, {name: id.substring(0, 10), count: 0}).name
53	53	})
54	54
55	55	return n

modules/post.jsView
		@@ -11,9 +11,9 @@
11	11	exports.message_content = function (data, sbot) {
12	12	if(!data.value.content \|\| !data.value.content.text) return
13	13
14	14	var root = data.value.content.root
15		- var re = !root ? null : h('span', 're:', message_link(root))
	15	+ var re = !root ? null : h('span', 're: ', message_link(root))
16	16
17	17	var content = h('div')
18	18	var d = h('div', re, content)
19	19

modules/private.jsView
		@@ -73,9 +73,9 @@
73	73	}
74	74
75	75	exports.message_meta = function (msg) {
76	76	if(msg.value.private)
77		- return "PRIVATE"
	77	+ return h('span', 'PRIVATE')
78	78	}
79	79
80	80
81	81

style.cssView
		@@ -91,13 +91,15 @@
91	91	.hypertabs__tabs > * {
92	92	max-width: 50px;
93	93	overflow-x: hidden;
94	94	margin-right: 5px;
	95	+ padding-top: 1px;
95	96	}
96	97
97		-.hypertabs__tab, .hypertabs--selected {
	98	+.hypertabs--selected {
98	99	background: white;
99	100	border: 1px solid #ccc;
	101	+ padding-top: 0;
100	102	padding-left: 5px;
101	103	padding-right: 5px;
102	104	max-width: 200px;
103	105	}
		@@ -120,9 +122,9 @@
120	122
121	123	.message {
122	124	border: 1px solid #ccc;
123	125	padding: 5px;
124		- margin-bottom: 1em;
	126	+ margin-top: 1em;
125	127	background: white;
126	128	display: block;
127	129	flex-basis: 0;
128	130	max-width: 100%;
		@@ -140,8 +142,11 @@
140	142
141	143	.message_meta {
142	144	margin-left: auto;
143	145	}
	146	+.message_meta > * {
	147	+ margin-left: 5px;
	148	+}
144	149	.message > .title > .avatar {
145	150	margin-left: 0;
146	151	}
147	152
		@@ -222,12 +227,8 @@
222	227	top: 10px;
223	228	width: 200px;
224	229	}
225	230
226		-.searchprompt:not(:focus) {
227		- opacity: 1;
228		-}
229		-
230	231	a {
231	232	color: #333;
232	233	}
233	234

ev / microbay