Browse Source

Style fixes

Enabled main menu roll animation
Fixed first click emoji
master
Igor Zhukov 10 years ago
parent
commit
5cc5d44bf2
  1. 8
      app/css/app.css
  2. 15
      app/css/desktop.css
  3. BIN
      app/img/icons/ProfileIcons_2x.png
  4. 2
      app/vendor/jquery.emojiarea/jquery.emojiarea.js

8
app/css/app.css

@ -1598,6 +1598,12 @@ img.im_message_document_thumb {
height: 4px; height: 4px;
width: 0; 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 { .audio_player_volume_slider {
width: 50px; width: 50px;
@ -2039,6 +2045,7 @@ img.img_fullsize {
.emoji-menu-tabs .icon-grid {background-position: -9px -248px; } .emoji-menu-tabs .icon-grid {background-position: -9px -248px; }
.emoji-menu-tabs .icon-grid-selected {background-position: -9px -222px; } .emoji-menu-tabs .icon-grid-selected {background-position: -9px -222px; }
.emoji-menu-tabs .icon-recent,
.emoji-menu-tabs .icon-smile, .emoji-menu-tabs .icon-smile,
.emoji-menu-tabs .icon-flower, .emoji-menu-tabs .icon-flower,
.emoji-menu-tabs .icon-bell, .emoji-menu-tabs .icon-bell,
@ -2046,6 +2053,7 @@ img.img_fullsize {
.emoji-menu-tabs .icon-grid { .emoji-menu-tabs .icon-grid {
opacity: 0.7; opacity: 0.7;
} }
.emoji-menu-tabs .icon-recent:hover,
.emoji-menu-tabs .icon-smile:hover, .emoji-menu-tabs .icon-smile:hover,
.emoji-menu-tabs .icon-flower:hover, .emoji-menu-tabs .icon-flower:hover,
.emoji-menu-tabs .icon-bell:hover, .emoji-menu-tabs .icon-bell:hover,

15
app/css/desktop.css

@ -31,10 +31,10 @@
background: #497799; background: #497799;
} }
/*.dropdown.open .tg_head_btn { .dropdown.open .tg_head_btn {
position: relative; position: relative;
z-index: 5; z-index: 5;
}*/ }
.tg_head_logo_dropdown .dropdown-toggle { .tg_head_logo_dropdown .dropdown-toggle {
color: #FFF; color: #FFF;
@ -124,13 +124,15 @@
float: none; float: none;
right: 0; right: 0;
border: 1px solid rgba(15, 60, 96, 0.2); 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); -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); -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); box-shadow: 0px 1px 3px 0px rgba(60,75,87,0.27);
overflow: hidden; overflow: hidden;
} }
/*@-webkit-keyframes rollIn { @-webkit-keyframes rollIn {
from { transform: translateY(-220px); } from { transform: translateY(-220px); }
to { transform: translateY(0); } to { transform: translateY(0); }
} }
@ -141,10 +143,10 @@
} }
.tg_head_logo_dropdown.open .dropdown-menu { .tg_head_logo_dropdown.open .dropdown-menu {
-webkit-animation: rollIn 0.2s cubic-bezier(0,2,1,0.5); -webkit-animation: rollIn 0.1s ease-in;
animation: rollIn 0.2s cubic-bezier(0,2,1,0.5); animation: rollIn 0.1s ease-in;
z-index: 4; z-index: 4;
}*/ }
.tg_head_logo_dropdown .dropdown-menu > li > a { .tg_head_logo_dropdown .dropdown-menu > li > a {
font-size: 12px; font-size: 12px;
line-height: 21px; line-height: 21px;
@ -726,6 +728,7 @@ a.footer_link.active:active {
display: inline-block; display: inline-block;
padding: 5px; padding: 5px;
outline: 0; outline: 0;
border-radius: 2px;
} }
.im_emoji_quick_select_area a:hover { .im_emoji_quick_select_area a:hover {

BIN
app/img/icons/ProfileIcons_2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

2
app/vendor/jquery.emojiarea/jquery.emojiarea.js vendored

@ -716,7 +716,7 @@
this.$items = $items; this.$items = $items;
this.load(0); this.load(0);
this.$items.on('click', 'a', function(e) { this.$items.on('mousedown', 'a', function(e) {
var emoji = $('.label', $(this)).text(); var emoji = $('.label', $(this)).text();
self.onItemSelected(emoji); self.onItemSelected(emoji);
self.changed = true; self.changed = true;

Loading…
Cancel
Save