diff --git a/Makefile b/Makefile index 344861ff..da4227be 100644 --- a/Makefile +++ b/Makefile @@ -18,4 +18,4 @@ package: publish: rm -rf dist/* cp -r app/* dist/ - cd dist && git add . && git commit -am "merged with master" && git push origin gh-pages \ No newline at end of file + cd dist && git add --all . && git commit -am "merged with master" && git push origin gh-pages \ No newline at end of file diff --git a/app/css/app.css b/app/css/app.css index 14539169..05178b14 100644 --- a/app/css/app.css +++ b/app/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/app/js/controllers.js b/app/js/controllers.js index ea6fd2dd..db1e96f7 100644 --- a/app/js/controllers.js +++ b/app/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);