git ssb

16+

Dominic / patchbay



Commit 28e76d892f8bbb14ee3e3fc73264841eeb8711b4

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

Dominic Tarr committed on 7/10/2016, 11:49:46 PM
Parent: 229516f922e23c750ab49ab934d32947c58d45ec
Parent: 0a2788627b5dbeabfff202201f4c580d228d1c0f

Files changed

modules/about.jschanged
modules/follow.jschanged
modules/names.jschanged
modules/post.jschanged
modules/private.jschanged
style.csschanged
modules/about.jsView
@@ -15,9 +15,9 @@
1515 var id = msg.value.content.about
1616 return h('p',
1717 about.about === msg.value.author
1818 ? h('span', 'self-identifies')
19- : h('span', 'identifies', idLink(id)),
19+ : h('span', 'identifies ', idLink(id)),
2020 ' as ',
2121 h('a', {href:"#/"+about.about},
2222 about.name || null,
2323 about.image
modules/follow.jsView
@@ -7,9 +7,9 @@
77 //render a message when someone follows someone,
88 //so you see new users
99 exports.message_content = function (msg) {
1010
11- if(msg.value.content.type == 'contact') {
11+ if(msg.value.content.type == 'contact' && msg.value.content.contact) {
1212 return h('div.contact',
1313 'follows',
1414 avatar(msg.value.content.contact)
1515 )
@@ -79,9 +79,9 @@
7979 following: !you_follow
8080 }, function (err) {
8181 //TODO: update after following.
8282 })
83- }}, label)
83+ }}, h('br'), label)
8484 )
8585 }
8686
8787
modules/names.jsView
@@ -42,14 +42,14 @@
4242 if (err) return console.error(err)
4343 getAvatar({links: sbot_links}, me.id, id,
4444 function (err, avatar) {
4545 if (err) return console.error(err)
46- n.textContent = avatar.name
46+ n.textContent = (avatar.name[0] == '@' ? '' : '@') + avatar.name
4747 })
4848 })
4949
5050 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
5252 }, {name: id.substring(0, 10), count: 0}).name
5353 })
5454
5555 return n
modules/post.jsView
@@ -11,9 +11,9 @@
1111 exports.message_content = function (data, sbot) {
1212 if(!data.value.content || !data.value.content.text) return
1313
1414 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))
1616
1717 var content = h('div')
1818 var d = h('div', re, content)
1919
modules/private.jsView
@@ -73,9 +73,9 @@
7373 }
7474
7575 exports.message_meta = function (msg) {
7676 if(msg.value.private)
77- return "PRIVATE"
77+ return h('span', 'PRIVATE')
7878 }
7979
8080
8181
style.cssView
@@ -91,13 +91,15 @@
9191 .hypertabs__tabs > * {
9292 max-width: 50px;
9393 overflow-x: hidden;
9494 margin-right: 5px;
95+ padding-top: 1px;
9596 }
9697
97-.hypertabs__tab, .hypertabs--selected {
98+.hypertabs--selected {
9899 background: white;
99100 border: 1px solid #ccc;
101+ padding-top: 0;
100102 padding-left: 5px;
101103 padding-right: 5px;
102104 max-width: 200px;
103105 }
@@ -120,9 +122,9 @@
120122
121123 .message {
122124 border: 1px solid #ccc;
123125 padding: 5px;
124- margin-bottom: 1em;
126+ margin-top: 1em;
125127 background: white;
126128 display: block;
127129 flex-basis: 0;
128130 max-width: 100%;
@@ -140,8 +142,11 @@
140142
141143 .message_meta {
142144 margin-left: auto;
143145 }
146+.message_meta > * {
147+ margin-left: 5px;
148+}
144149 .message > .title > .avatar {
145150 margin-left: 0;
146151 }
147152
@@ -222,12 +227,8 @@
222227 top: 10px;
223228 width: 200px;
224229 }
225230
226-.searchprompt:not(:focus) {
227- opacity: 1;
228-}
229-
230231 a {
231232 color: #333;
232233 }
233234

Built with git-ssb-web