Commit d4d818f76cef533b46d42f0af423343ac6fed93c
Merge branch 'master' of https://github.com/evbogue/patchbay
Dominic Tarr committed on 7/1/2016, 5:44:12 AMParent: 5b46dbb0cc1ca37ee4d0b3f41ebf8542d46448dd
Parent: 744ed66440b6e896ecb4895c24d57ec202bcd334
Files changed
| modules/avatar-profile.js | changed |
| style.css | changed |
| modules/avatar-profile.js | ||
|---|---|---|
| @@ -5,9 +5,9 @@ | ||
| 5 | 5 | var avatar_action = plugs.map(exports.avatar_action = []) |
| 6 | 6 | |
| 7 | 7 | exports.avatar_profile = function (id) { |
| 8 | 8 | |
| 9 | - return h('div.row', | |
| 9 | + return h('div.row.profile', | |
| 10 | 10 | avatar_image(id), |
| 11 | 11 | h('div.column', avatar_action(id)) |
| 12 | 12 | ) |
| 13 | 13 | } |
| style.css | ||
|---|---|---|
| @@ -53,8 +53,9 @@ | ||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | pre { |
| 56 | 56 | max-width: 650px; |
| 57 | + white-space: pre-wrap; | |
| 57 | 58 | // overflow-x: auto; |
| 58 | 59 | // overflox-y: none; |
| 59 | 60 | } |
| 60 | 61 | |
| @@ -130,8 +131,10 @@ | ||
| 130 | 131 | display: block; |
| 131 | 132 | flex-basis: 0; |
| 132 | 133 | max-width: 100%; |
| 133 | 134 | min-width: 300px; |
| 135 | + word-wrap:break-word; | |
| 136 | + display:inline-block; | |
| 134 | 137 | } |
| 135 | 138 | |
| 136 | 139 | .message_meta input { |
| 137 | 140 | border: none; |
| @@ -143,9 +146,9 @@ | ||
| 143 | 146 | .message > .title > .message_meta { |
| 144 | 147 | margin-left: 5px; |
| 145 | 148 | } |
| 146 | 149 | .message > .title > .avatar { |
| 147 | - margin-left: 5px; | |
| 150 | + margin-left: 0; | |
| 148 | 151 | } |
| 149 | 152 | |
| 150 | 153 | .message_content { |
| 151 | 154 | margin-top: 5px; |
| @@ -156,24 +159,31 @@ | ||
| 156 | 159 | /* -- suggest box */ |
| 157 | 160 | |
| 158 | 161 | |
| 159 | 162 | .suggest-box > * { |
| 160 | - background: white; | |
| 163 | + background: #f5f5f5; | |
| 164 | + border: 1px solid #ccc; | |
| 161 | 165 | margin: 3px; |
| 162 | 166 | } |
| 163 | 167 | |
| 164 | -.suggest-box{ | |
| 168 | +.suggest-box { | |
| 165 | 169 | // display: flex; |
| 166 | 170 | // flex-direction: row; |
| 167 | 171 | width: 200px; |
| 172 | + margin-left: -7em; | |
| 168 | 173 | } |
| 169 | 174 | |
| 175 | +.suggest-box ul { | |
| 176 | + list-style-type: none; | |
| 177 | + padding-left: -20px; | |
| 178 | +} | |
| 179 | + | |
| 170 | 180 | .suggest-box .selected { |
| 171 | - background: yellow; | |
| 181 | + background: #ccc; | |
| 172 | 182 | } |
| 173 | 183 | |
| 174 | 184 | .suggest-box img { |
| 175 | - width: 50px; | |
| 185 | + width: 40px; | |
| 176 | 186 | } |
| 177 | 187 | .suggest-box,.selected img { |
| 178 | 188 | width: 200px; |
| 179 | 189 | } |
| @@ -190,20 +200,36 @@ | ||
| 190 | 200 | //display: inline-block; |
| 191 | 201 | border: 1px solid #ccc; |
| 192 | 202 | } |
| 193 | 203 | |
| 204 | +.profile { | |
| 205 | + background: #fff; | |
| 206 | + border: 1px solid #ccc; | |
| 207 | +} | |
| 208 | + | |
| 209 | +.profile img { | |
| 210 | + width: 150px; | |
| 211 | + height: 150px; | |
| 212 | + margin-right: 1em; | |
| 213 | + margin-bottom: 1em; | |
| 214 | + border: 1px solid #ccc; | |
| 215 | +} | |
| 216 | + | |
| 194 | 217 | /* lightbox - used in message-confirm */ |
| 195 | 218 | |
| 196 | 219 | .lightbox { |
| 197 | 220 | overflow: auto; |
| 221 | + width: 80%; | |
| 222 | + border: 1px solid #ccc; // this is being overwritten in hyperlightbox module | |
| 198 | 223 | } |
| 199 | 224 | |
| 200 | 225 | /* searchprompt */ |
| 201 | 226 | |
| 202 | 227 | .searchprompt { |
| 203 | 228 | position: absolute; |
| 229 | + right: 10px; | |
| 204 | 230 | top: 10px; |
| 205 | - right: 15px; | |
| 231 | + width: 200px; | |
| 206 | 232 | } |
| 207 | 233 | |
| 208 | 234 | .searchprompt:not(:focus) { |
| 209 | 235 | opacity: 1; |
| @@ -218,7 +244,7 @@ | ||
| 218 | 244 | } |
| 219 | 245 | |
| 220 | 246 | /* TextNodeSearcher highlights */ |
| 221 | 247 | |
| 222 | -highlight { | |
| 248 | +.highlight { | |
| 223 | 249 | background: yellow; |
| 224 | 250 | } |
Built with git-ssb-web