git ssb - fix conflicts · ev/decent@5b989f19

build/index.htmlView
The diff is too large to show. Use a local git client to view these changes. Old file size: 1229848 bytes New file size: 1229893 bytes

client/modules/compose.jsView
		@@ -65,9 +65,9 @@
65	65 …	var embed = file.type.indexOf('image/') === 0 ? '!' : ''
66	66 …	ta.value += embed + '['+file.name+']('+file.link+')'
67	67 …	console.log('added:', file)
68	68 …	}),
69		- publishBtn)
	69 …	+ publishBtn/, api.avatar_link(me, api.avatar_image(me, 'tiny'))/)
70	70 …
71	71 …
72	72 …	if(opts.shrink !== false) {
73	73 …	var blur
		@@ -134,9 +134,9 @@
134	134 …	var composer =
135	135 …	h('div.compose',
136	136 …	h('div.column',
137	137 …	ta,
138		- channel,
	138 …	+ //channel,
139	139 …	accessories
140	140 …	)
141	141 …	)
142	142 …

client/modules/public.jsView
		@@ -23,9 +23,9 @@
23	23 …	var content = h('div.column.scroller__content')
24	24 …	var div = h('div.column.scroller',
25	25 …	{style: {'overflow':'auto'}},
26	26 …	h('div.scroller__wrapper',
27		- api.message_compose({type: 'post'}, {placeholder: 'Write here...'}),
	27 …	+ api.message_compose({type: 'post'}, {placeholder: ' '}),
28	28 …	content
29	29 …	)
30	30 …	)
31	31 …

ev / decent