From 5cc5d44bf28226785fb9abf9e64512bb3df37571 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Fri, 16 Jan 2015 18:40:06 +0300 Subject: [PATCH] Style fixes Enabled main menu roll animation Fixed first click emoji --- app/css/app.css | 8 ++++++++ app/css/desktop.css | 15 +++++++++------ app/img/icons/ProfileIcons_2x.png | Bin 6321 -> 6157 bytes .../jquery.emojiarea/jquery.emojiarea.js | 2 +- 4 files changed, 18 insertions(+), 7 deletions(-) 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 ffd330ad677038082f13e74b42567de075ba0758..f49cc8560e12cfac318f471ed9bf360580aed205 100644 GIT binary patch delta 5306 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 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;