From 78d37ceead07cb7ada6881d045d61efbc23356df Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Sat, 15 Feb 2014 00:52:06 +0400 Subject: [PATCH] merged with master --- css/app.css | 4 ++-- js/controllers.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/css/app.css b/css/app.css index 14539169..05178b14 100644 --- a/css/app.css +++ b/css/app.css @@ -1867,7 +1867,7 @@ img.img_fullsize { width: 17px; height: 15px; margin: 10px 0 0 -75px; - background: url(../img/icons/IconsetW.png?1) -13px -344px no-repeat; + background: url(../img/icons/IconsetW.png?1) -13px -343px no-repeat; background-size: 42px 460px; } .is_1x .icon-select-tick { @@ -1880,7 +1880,7 @@ img.img_fullsize { .im_message_selected .icon-select-tick, .im_history_selectable .im_message_outer_wrap:hover .icon-select-tick { background-position: -13px -367px; - opacity: 0.6; + opacity: 0.5; } .im_message_selected .icon-select-tick { opacity: 1 !important; diff --git a/js/controllers.js b/js/controllers.js index ea6fd2dd..db1e96f7 100644 --- a/js/controllers.js +++ b/js/controllers.js @@ -337,6 +337,7 @@ angular.module('myApp.controllers', []) jump = 0; function applyDialogSelect (newPeer) { + selectedCancel(); newPeer = newPeer || $scope.curDialog.peer || ''; peerID = AppPeersManager.getPeerID(newPeer);