Commit 40f1f8902cd7e4caa2b1b3e52113ba0c68122007
Merge branch 'master' of https://github.com/evbogue/patchbay
Dominic Tarr committed on 7/20/2016, 7:51:15 AMParent: a919f2bd7e418328cfafb3bfa17695b53decb589
Parent: 890435b264f902c0b56c9dd63ab300d7b56a8644
Files changed
| modules/like.js | changed |
| modules/message.js | changed |
| style.css | changed |
| modules/like.js | ||
|---|---|---|
| @@ -12,46 +12,46 @@ | ||
| 12 | 12 | exports.message_content = function (msg, sbot) { |
| 13 | 13 | if(msg.value.content.type !== 'vote') return |
| 14 | 14 | var link = msg.value.content.vote.link |
| 15 | 15 | return h('div', |
| 16 | - msg.value.content.vote.value > 0 ? 'yup' : 'nah', | |
| 16 | + msg.value.content.vote.value > 0 ? 'Dug' : 'Undug', | |
| 17 | 17 | ' ', message_link(link) |
| 18 | 18 | ) |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | exports.message_meta = function (msg, sbot) { |
| 22 | 22 | |
| 23 | - var yupps = h('a') | |
| 23 | + var digs = h('a') | |
| 24 | 24 | |
| 25 | 25 | pull( |
| 26 | 26 | sbot_links({dest: msg.key, rel: 'vote'}), |
| 27 | 27 | pull.collect(function (err, votes) { |
| 28 | 28 | if(votes.length === 1) |
| 29 | - yupps.textContent = ' 1 yup' | |
| 30 | - if(votes.length) | |
| 31 | - yupps.textContent = ' ' + votes.length + ' yupps' | |
| 29 | + digs.textContent = ' 1 Dig' | |
| 30 | + if(votes.length > 1) | |
| 31 | + digs.textContent = ' ' + votes.length + ' Digs' | |
| 32 | 32 | }) |
| 33 | 33 | ) |
| 34 | 34 | |
| 35 | - return yupps | |
| 35 | + return digs | |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | exports.message_action = function (msg, sbot) { |
| 39 | 39 | if(msg.value.content.type !== 'vote') |
| 40 | 40 | return h('a', {href: '#', onclick: function () { |
| 41 | - var yup = { | |
| 41 | + var dig = { | |
| 42 | 42 | type: 'vote', |
| 43 | - vote: { link: msg.key, value: 1, expression: 'yup' } | |
| 43 | + vote: { link: msg.key, value: 1, expression: 'Dig' } | |
| 44 | 44 | } |
| 45 | 45 | if(msg.value.content.recps) { |
| 46 | - yup.recps = msg.value.content.recps.map(function (e) { | |
| 46 | + dig.recps = msg.value.content.recps.map(function (e) { | |
| 47 | 47 | return e && typeof e !== 'string' ? e.link : e |
| 48 | 48 | }) |
| 49 | - yup.private = true | |
| 49 | + dig.private = true | |
| 50 | 50 | } |
| 51 | 51 | //TODO: actually publish... |
| 52 | 52 | |
| 53 | - message_confirm(yup) | |
| 54 | - }}, 'yup') | |
| 53 | + message_confirm(dig) | |
| 54 | + }}, 'Dig') | |
| 55 | 55 | |
| 56 | 56 | } |
| 57 | 57 | |
| modules/message.js | ||
|---|---|---|
| @@ -37,9 +37,11 @@ | ||
| 37 | 37 | h('div.message_meta.row', message_meta(msg)) |
| 38 | 38 | ), |
| 39 | 39 | h('div.message_content', el), |
| 40 | 40 | h('div.message_actions.row', |
| 41 | - h('div.actions', message_action(msg)) | |
| 41 | + h('div.actions', message_action(msg), ' ', | |
| 42 | + h('a', {href: '#' + msg.key}, 'Reply') | |
| 43 | + ) | |
| 42 | 44 | ), |
| 43 | 45 | backlinks, |
| 44 | 46 | {onkeydown: function (ev) { |
| 45 | 47 | //on enter, hit first meta. |
| style.css | ||
|---|---|---|
| @@ -108,13 +108,13 @@ | ||
| 108 | 108 | |
| 109 | 109 | input { |
| 110 | 110 | margin-left: 3px; |
| 111 | 111 | margin-right: 3px; |
| 112 | - border: 1px solid #ccc; | |
| 112 | + border: 1px solid #eee; | |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | textarea { |
| 116 | - border: 1px solid #ccc; | |
| 116 | + border: 1px solid #eee; | |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | /* compose */ |
| 120 | 120 | |
| @@ -124,11 +124,11 @@ | ||
| 124 | 124 | |
| 125 | 125 | /* messages */ |
| 126 | 126 | |
| 127 | 127 | .message { |
| 128 | - border: 1px solid #ccc; | |
| 128 | + border: 1px solid #eee; | |
| 129 | 129 | padding: 5px; |
| 130 | - margin-top: 1em; | |
| 130 | + margin-top: .5em; | |
| 131 | 131 | background: white; |
| 132 | 132 | display: block; |
| 133 | 133 | flex-basis: 0; |
| 134 | 134 | max-width: 100%; |
| @@ -149,15 +149,19 @@ | ||
| 149 | 149 | } |
| 150 | 150 | .message_meta > * { |
| 151 | 151 | margin-left: 5px; |
| 152 | 152 | } |
| 153 | +.message_actions { | |
| 154 | + float: right; | |
| 155 | +} | |
| 156 | + | |
| 153 | 157 | .message > .title > .avatar { |
| 154 | 158 | margin-left: 0; |
| 155 | 159 | } |
| 156 | 160 | |
| 157 | 161 | .message_content { |
| 158 | 162 | margin-top: 5px; |
| 159 | - border-top: 1px solid #ccc; | |
| 163 | + border-top: 1px solid #eee; | |
| 160 | 164 | padding-top: 3px; |
| 161 | 165 | } |
| 162 | 166 | |
| 163 | 167 | /* -- suggest box */ |
| @@ -202,9 +206,9 @@ | ||
| 202 | 206 | } |
| 203 | 207 | |
| 204 | 208 | .profile { |
| 205 | 209 | background: #fff; |
| 206 | - border: 1px solid #ccc; | |
| 210 | + border: 1px solid #eee; | |
| 207 | 211 | } |
| 208 | 212 | |
| 209 | 213 | .profile img { |
| 210 | 214 | width: 150px; |
| @@ -217,12 +221,22 @@ | ||
| 217 | 221 | /* lightbox - used in message-confirm */ |
| 218 | 222 | |
| 219 | 223 | .lightbox { |
| 220 | 224 | overflow: auto; |
| 221 | - width: 80%; | |
| 222 | - border: 1px solid #ccc; // this is being overwritten in hyperlightbox module | |
| 225 | + background: #fff; | |
| 226 | + width: 600px; | |
| 227 | + border: 1px solid #eee; | |
| 228 | + top: 2em; | |
| 229 | + bottom: 2em; | |
| 230 | + left: 2em; | |
| 231 | + right: 2em; | |
| 232 | + padding: 1em; | |
| 223 | 233 | } |
| 224 | 234 | |
| 235 | +.message-confirm { | |
| 236 | + background: #fff; | |
| 237 | +} | |
| 238 | + | |
| 225 | 239 | /* searchprompt */ |
| 226 | 240 | |
| 227 | 241 | .searchprompt { |
| 228 | 242 | width: 250px; |
Built with git-ssb-web