Commit dbcbcebcc17e4af6558db59f3642b5af965caa75
1 parent
3e6018b829
Providing cca when emoji selector is displayed
Showing 3 changed files with 9 additions and 2 deletions
app/images/emoji_button_inv.png
View file @
dbcbceb
1.83 KB
app/scripts/views/compose-message.js
View file @
dbcbceb
| ... | ... | @@ -24,11 +24,14 @@ |
| 24 | 24 | }, |
| 25 | 25 | |
| 26 | 26 | _toggleEmojiList: function () { |
| 27 | - this._emojiSelector[this._emojiSelector.isHidden() ? 'show' : 'hide'](); | |
| 27 | + var isHidden = this._emojiSelector.isHidden(); | |
| 28 | + this.$el.find('#insert-emoji').get(0).classList.toggle('shown'); | |
| 29 | + this._emojiSelector[isHidden ? 'show' : 'hide'](); | |
| 28 | 30 | }, |
| 29 | 31 | |
| 30 | 32 | _hideEmojiList: function () { |
| 31 | 33 | this._emojiSelector.hide(); |
| 34 | + this.$el.find('#insert-emoji').get(0).classList.remove('shown'); | |
| 32 | 35 | }, |
| 33 | 36 | |
| 34 | 37 | clear: function () { |
app/styles/_conversation.sass
View file @
dbcbceb
| ... | ... | @@ -308,7 +308,7 @@ |
| 308 | 308 | form#conversation-compose-image |
| 309 | 309 | +box-shadow(0 -0.2rem 0.1rem rgba(0, 0, 0, 0.15)) |
| 310 | 310 | background: #fff |
| 311 | - padding: 0.6rem 0.3rem | |
| 311 | + padding: 0.6rem 0.3rem 0 0 | |
| 312 | 312 | font-size: 0 |
| 313 | 313 | |
| 314 | 314 | form#conversation-compose input[type=text], |
| 315 | 315 | |
| ... | ... | @@ -352,8 +352,12 @@ |
| 352 | 352 | margin-right: 0.7rem |
| 353 | 353 | |
| 354 | 354 | #insert-emoji |
| 355 | + width: 4rem | |
| 355 | 356 | background: url(/images/emoji_button.png) center center no-repeat |
| 356 | 357 | +background-size(3rem 3rem) |
| 358 | + &.shown | |
| 359 | + background-image: url(/images/emoji_button_inv.png) | |
| 360 | + background-color: #333 | |
| 357 | 361 | |
| 358 | 362 | #conversation-send-button |
| 359 | 363 | background: url(/images/send.png) center center no-repeat |