From cb1ea1867120a80f9f8b5a53a49ced3afddce534 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Thu, 8 Oct 2015 21:11:05 +0300 Subject: [PATCH] initial draft --- app/img/icons/IconsetSmiles.png | Bin 5276 -> 4433 bytes app/img/icons/IconsetSmiles_2x.png | Bin 10563 -> 7901 bytes app/js/message_composer.js | 30 +++++----- app/less/app.less | 90 ++++++++++++++++++++--------- 4 files changed, 79 insertions(+), 41 deletions(-) diff --git a/app/img/icons/IconsetSmiles.png b/app/img/icons/IconsetSmiles.png index 128f3608f9c7c7d789c6919fb6784c89f83bb0d2..7ee734067f987c5c9c704a2d4d67d0a783e9e89d 100644 GIT binary patch delta 3817 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 Fe*;rrA)^2Q delta 4667 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 Y`)Qdj=lDYv^*#t-0yQ_N)^m>iKk9MHod5s; diff --git a/app/img/icons/IconsetSmiles_2x.png b/app/img/icons/IconsetSmiles_2x.png index d6594207a9d6e79b0f161e4b8f0bbcc09889ecf6..b05da5ed9afe33480d2cc11b57acb65daa286fcd 100644 GIT binary patch delta 7313 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 literal 10563 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 diff --git a/app/js/message_composer.js b/app/js/message_composer.js index c53d0469..b903a290 100644 --- a/app/js/message_composer.js +++ b/app/js/message_composer.js @@ -204,27 +204,26 @@ EmojiTooltip.prototype.createTooltip = function () { } var self = this; - this.tooltipEl = $('
').appendTo(document.body); + this.tooltipEl = $('').appendTo(document.body); this.tabsEl = $('.composer_emoji_tooltip_tabs', this.tooltipEl); + this.categoriesEl = $('.composer_emoji_tooltip_categories', this.tooltipEl); this.contentEl = $('.composer_emoji_tooltip_content', this.tooltipEl); - this.footerEl = $('.composer_emoji_tooltip_footer', this.tooltipEl); - this.settingsEl = $('.composer_emoji_tooltip_settings', this.tooltipEl); - angular.forEach(['recent', 'smile', 'flower', 'bell', 'car', 'grid', 'stickers'], function (tabName, tabIndex) { - var tab = $('') + angular.forEach(['recent', 'smile', 'flower', 'bell', 'car', 'grid'], function (tabName, tabIndex) { + var tab = $('') .on('mousedown', function (e) { - self.selectTab(tabIndex); + self.selectCategory(tabIndex); return cancelEvent(e); }) - .appendTo(self.tabsEl); + .appendTo(self.categoriesEl); if (!Config.Navigator.touch) { tab.on('mouseenter mouseleave', function (e) { - clearTimeout(self.selectTabTimeout); + clearTimeout(self.selectCategoryTimeout); if (e.type == 'mouseenter') { - self.selectTabTimeout = setTimeout(function () { - self.selectTab(tabIndex); + self.selectCategoryTimeout = setTimeout(function () { + self.selectCategory(tabIndex); }, 300); } }); @@ -272,7 +271,7 @@ EmojiTooltip.prototype.createTooltip = function () { }); } - this.selectTab(0); + this.selectCategory(0); $(window).on('resize', this.updatePosition.bind(this)); @@ -280,13 +279,13 @@ EmojiTooltip.prototype.createTooltip = function () { } -EmojiTooltip.prototype.selectTab = function (tab) { +EmojiTooltip.prototype.selectCategory = function (tab) { if (this.tab === tab && tab != 6) { return false; } - $('.active', this.tabsEl).removeClass('active'); + $('.active', this.categoriesEl).removeClass('active'); this.tab = tab; - $(this.tabsEl[0].childNodes[tab]).addClass('active'); + $(this.categoriesEl[0].childNodes[tab]).addClass('active'); this.updateTabContents(); }; @@ -294,7 +293,7 @@ EmojiTooltip.prototype.selectTab = function (tab) { EmojiTooltip.prototype.updateTabContents = function () { var html = []; var self = this; - var iconSize = Config.Mobile ? 26 : 20; + var iconSize = 26;//Config.Mobile ? 26 : 20; var renderContent = function () { self.contentEl.html(html.join('')); @@ -389,6 +388,7 @@ EmojiTooltip.prototype.show = function () { }; EmojiTooltip.prototype.hide = function () { + return; if (this.tooltipEl) { this.tooltipEl.removeClass('composer_emoji_tooltip_shown'); this.btnEl.removeClass('composer_emoji_insert_btn_on'); diff --git a/app/less/app.less b/app/less/app.less index 99b15555..7ef51abd 100644 --- a/app/less/app.less +++ b/app/less/app.less @@ -2370,7 +2370,7 @@ img.img_fullsize { display: none; position: absolute; z-index: 999; - width: 254px; + width: 284px; margin-left: -116px; margin-top: -245px; @@ -2416,68 +2416,106 @@ img.img_fullsize { } .composer_emoji_tooltip_tabs { + border-bottom: 1px solid #e5e5e5; +} +.composer_emoji_tooltip_tab { + display: inline-block; + line-height: 36px; + text-align: center; + width: 50%; + text-transform: uppercase; + font-weight: bold; + + &:hover, + &:active, + &:focus { + color: inherit; + text-decoration: none; + } +} +.composer_emoji_tooltip_tab_emoji, +.composer_emoji_tooltip_tabs_stickers_active .composer_emoji_tooltip_tab_stickers { + color: #53a9ea; +} +.composer_emoji_tooltip_tabs_stickers_active .composer_emoji_tooltip_tab_emoji, +.composer_emoji_tooltip_tab_stickers { + color: #999; +} +.composer_emoji_tooltip_tab_shadow { + width: 50%; + height: 2px; + background: #53a9ea; + + .composer_emoji_tooltip_tabs_stickers_active & { + left: 50%; + } +} + +.composer_emoji_tooltip_categories { width: 100%; - margin: 5px 0 2px; + margin: 9px 0 4px; } -.composer_emoji_tooltip_tab { +.composer_emoji_tooltip_category { line-height: 0; color: white; display: inline-block; - width: 24px; - height: 29px; + width: 21px; + height: 21px; cursor: pointer; - opacity: 0.7; - margin: 0 5px 0 4px; + opacity: 0.3; + margin: 0 12px 0 12px; - .image-2x('../img/icons/IconsetSmiles.png', 42px, 470px); + .image-2x('../img/icons/IconsetSmiles.png', 27px, 362px); - &.active { + &:hover { + opacity: 0.4; + } + &.active, + &.active:hover { opacity: 1; } } /* Recent */ -.composer_emoji_tooltip_tab_recent {background-position: -9px -306px; } -.composer_emoji_tooltip_tab_recent.active {background-position: -9px -277px; } +.composer_emoji_tooltip_category_recent {background-position: -3px 0; } +.composer_emoji_tooltip_category_recent.active {background-position: -3px -31px; } /* Smile */ -.composer_emoji_tooltip_tab_smile {background-position: -9px -34px; } -.composer_emoji_tooltip_tab_smile.active {background-position: -9px -5px; } +.composer_emoji_tooltip_category_smile {background-position: -3px -62px; } +.composer_emoji_tooltip_category_smile.active {background-position: -3px -93px; } /* Flower */ -.composer_emoji_tooltip_tab_flower {background-position: -9px -145px; } -.composer_emoji_tooltip_tab_flower.active {background-position: -9px -118px; } +.composer_emoji_tooltip_category_flower {background-position: -3px -124px; } +.composer_emoji_tooltip_category_flower.active {background-position: -3px -155px; } /* Bell */ -.composer_emoji_tooltip_tab_bell {background-position: -9px -89px; } -.composer_emoji_tooltip_tab_bell.active {background-position: -9px -61px; } +.composer_emoji_tooltip_category_bell {background-position: -3px -186px; } +.composer_emoji_tooltip_category_bell.active {background-position: -3px -217px; } /* Car */ -.composer_emoji_tooltip_tab_car {background-position: -9px -196px; } -.composer_emoji_tooltip_tab_car.active {background-position: -9px -170px; } +.composer_emoji_tooltip_category_car {background-position: -3px -245px; } +.composer_emoji_tooltip_category_car.active {background-position: -3px -276px; } /* Grid */ -.composer_emoji_tooltip_tab_grid {background-position: -9px -248px; } -.composer_emoji_tooltip_tab_grid.active {background-position: -9px -222px; } +.composer_emoji_tooltip_category_grid {background-position: -3px -304px; } +.composer_emoji_tooltip_category_grid.active {background-position: -3px -335px; } -/* Stickers */ -.composer_emoji_tooltip_tab_stickers {background-position: -9px -361px; } -.composer_emoji_tooltip_tab_stickers.active {background-position: -9px -333px; } .composer_emoji_tooltip .scroller_scrollable_container { - height: 174px; + height: 233px; position: relative; } .composer_emoji_tooltip_content { + padding-top: 10px; padding-right: 8px; outline: 0!important; } a.composer_emoji_btn { margin: 0 1px 0 0; - padding: 6px; + padding: 5px; display: block; float: left; border-radius: 2px;