Commit edfd0a45094b16686ec6472fc43e229687f04843
Merge branch 'master' of ssb://%yxGEc2cFJxAvxGyPL5dzU07L8fRNS8YSxhkmPe68nqA=.sha256 into avatar_edit
Dominic Tarr committed on 7/24/2016, 2:30:17 AMParent: 20e18a424acad66e1f6e83ad1aa129f2fabdbb0d
Parent: 4bcfc9f6bc102b97669476fbfb3c7cf0457647ee
Files changed
| modules/avatar-profile.js | changed |
| style.css | changed |
| modules/avatar-profile.js | ||
|---|---|---|
| @@ -1,15 +1,19 @@ | ||
| 1 | 1 | var h = require('hyperscript') |
| 2 | 2 | var plugs = require('../plugs') |
| 3 | 3 | |
| 4 | + | |
| 4 | 5 | var avatar_image = plugs.first(exports.avatar_image = []) |
| 6 | +var avatar_name = plugs.first(exports.avatar_name = []) | |
| 5 | 7 | var avatar_action = plugs.map(exports.avatar_action = []) |
| 6 | 8 | var avatar_edit = plugs.first(exports.avatar_edit = []) |
| 7 | 9 | |
| 8 | 10 | exports.avatar_profile = function (id) { |
| 9 | 11 | return avatar_edit(id) |
| 10 | 12 | |
| 11 | 13 | return h('div.row.profile', |
| 12 | 14 | avatar_image(id), |
| 13 | - h('div.column', avatar_action(id)) | |
| 15 | + h('div.profile__info', | |
| 16 | + h('strong', avatar_name(id)), | |
| 17 | + avatar_action(id)) | |
| 14 | 18 | ) |
| 15 | 19 | } |
| style.css | ||
|---|---|---|
| @@ -1,8 +1,10 @@ | ||
| 1 | 1 | body { |
| 2 | 2 | font-family: "Source Sans Pro", sans-serif; |
| 3 | 3 | } |
| 4 | 4 | |
| 5 | +p { margin-top: .35ex;} | |
| 6 | + | |
| 5 | 7 | .screen { |
| 6 | 8 | position: absolute; |
| 7 | 9 | top: 0px; bottom: 0px; |
| 8 | 10 | left: 0px; right: 0px; |
| @@ -125,9 +127,9 @@ | ||
| 125 | 127 | /* messages */ |
| 126 | 128 | |
| 127 | 129 | .message { |
| 128 | 130 | border: 1px solid #eee; |
| 129 | - padding: 5px; | |
| 131 | + padding: 7px; | |
| 130 | 132 | margin-top: .5em; |
| 131 | 133 | background: white; |
| 132 | 134 | display: block; |
| 133 | 135 | flex-basis: 0; |
| @@ -212,19 +214,22 @@ | ||
| 212 | 214 | } |
| 213 | 215 | |
| 214 | 216 | .profile { |
| 215 | 217 | background: #fff; |
| 218 | + padding: .5em; | |
| 216 | 219 | border: 1px solid #eee; |
| 217 | 220 | } |
| 218 | 221 | |
| 219 | 222 | .profile img { |
| 220 | 223 | width: 150px; |
| 221 | 224 | height: 150px; |
| 222 | - margin-right: 1em; | |
| 223 | - margin-bottom: 1em; | |
| 224 | - border: 1px solid #ccc; | |
| 225 | + border: 1px solid #eee; | |
| 225 | 226 | } |
| 226 | 227 | |
| 228 | +.profile__info { | |
| 229 | + margin-left: .5em; | |
| 230 | +} | |
| 231 | + | |
| 227 | 232 | /* lightbox - used in message-confirm */ |
| 228 | 233 | |
| 229 | 234 | .lightbox { |
| 230 | 235 | overflow: auto; |
Built with git-ssb-web