diff --git a/app/css/app.css b/app/css/app.css index bb33e018..a651e311 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -1598,6 +1598,12 @@ img.im_message_document_thumb { height: 4px; width: 0; } +.audio_player_seek_slider .tg_slider_thumb { + display: none; +} +.audio_player_seek_slider:hover .tg_slider_thumb { + display: block; +} .audio_player_volume_slider { width: 50px; @@ -2039,6 +2045,7 @@ img.img_fullsize { .emoji-menu-tabs .icon-grid {background-position: -9px -248px; } .emoji-menu-tabs .icon-grid-selected {background-position: -9px -222px; } +.emoji-menu-tabs .icon-recent, .emoji-menu-tabs .icon-smile, .emoji-menu-tabs .icon-flower, .emoji-menu-tabs .icon-bell, @@ -2046,6 +2053,7 @@ img.img_fullsize { .emoji-menu-tabs .icon-grid { opacity: 0.7; } +.emoji-menu-tabs .icon-recent:hover, .emoji-menu-tabs .icon-smile:hover, .emoji-menu-tabs .icon-flower:hover, .emoji-menu-tabs .icon-bell:hover, diff --git a/app/css/desktop.css b/app/css/desktop.css index 16671590..529be3bb 100644 --- a/app/css/desktop.css +++ b/app/css/desktop.css @@ -31,10 +31,10 @@ background: #497799; } -/*.dropdown.open .tg_head_btn { +.dropdown.open .tg_head_btn { position: relative; z-index: 5; -}*/ +} .tg_head_logo_dropdown .dropdown-toggle { color: #FFF; @@ -124,13 +124,15 @@ float: none; right: 0; border: 1px solid rgba(15, 60, 96, 0.2); + border-left-color: #b5c3d0; + border-right-color: #b5c3d0; -webkit-box-shadow: 0px 1px 3px 0px rgba(60,75,87,0.27); -moz-box-shadow: 0px 1px 3px 0px rgba(60,75,87,0.27); box-shadow: 0px 1px 3px 0px rgba(60,75,87,0.27); overflow: hidden; } -/*@-webkit-keyframes rollIn { +@-webkit-keyframes rollIn { from { transform: translateY(-220px); } to { transform: translateY(0); } } @@ -141,10 +143,10 @@ } .tg_head_logo_dropdown.open .dropdown-menu { - -webkit-animation: rollIn 0.2s cubic-bezier(0,2,1,0.5); - animation: rollIn 0.2s cubic-bezier(0,2,1,0.5); + -webkit-animation: rollIn 0.1s ease-in; + animation: rollIn 0.1s ease-in; z-index: 4; -}*/ +} .tg_head_logo_dropdown .dropdown-menu > li > a { font-size: 12px; line-height: 21px; @@ -726,6 +728,7 @@ a.footer_link.active:active { display: inline-block; padding: 5px; outline: 0; + border-radius: 2px; } .im_emoji_quick_select_area a:hover { diff --git a/app/img/icons/ProfileIcons_2x.png b/app/img/icons/ProfileIcons_2x.png index ffd330ad..f49cc856 100644 Binary files a/app/img/icons/ProfileIcons_2x.png and b/app/img/icons/ProfileIcons_2x.png differ diff --git a/app/vendor/jquery.emojiarea/jquery.emojiarea.js b/app/vendor/jquery.emojiarea/jquery.emojiarea.js index ea13b328..609dcda7 100644 --- a/app/vendor/jquery.emojiarea/jquery.emojiarea.js +++ b/app/vendor/jquery.emojiarea/jquery.emojiarea.js @@ -716,7 +716,7 @@ this.$items = $items; this.load(0); - this.$items.on('click', 'a', function(e) { + this.$items.on('mousedown', 'a', function(e) { var emoji = $('.label', $(this)).text(); self.onItemSelected(emoji); self.changed = true;