diff --git a/app/css/app.css b/app/css/app.css index 122f9185..7defae5b 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -1025,6 +1025,15 @@ div.im_message_video_thumb { background-image: url(../img/icons/IconsetW_1x.png?2); } +.im_message_selected .icon-document, +.im_message_selected .icon-photo, +.im_message_selected .icon-video, +.im_history_selectable .im_message_outer_wrap:hover .icon-document, +.im_history_selectable .im_message_outer_wrap:hover .icon-photo, +.im_history_selectable .im_message_outer_wrap:hover .icon-video { + background-color: #dae6f0; +} + .im_message_document_info { float: left; } @@ -2219,8 +2228,8 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status { display: none; width: 26px; height: 26px; - margin: 14px 0 0 40px; - background: url(../img/icons/IconsetW.png?1) -9px -515px no-repeat; + margin: 13px 0 0 40px; + background: url(../img/icons/IconsetW.png?1) -9px -516px no-repeat; background-size: 42px 560px; } .is_1x .icon-select-tick { @@ -2233,7 +2242,7 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status { .im_message_selected .icon-select-tick, .im_history_selectable .im_message_outer_wrap:hover .icon-select-tick, .im_content_message_select_area:hover .icon-select-tick { - background-position: -9px -480px; + background-position: -9px -481px; opacity: 0.5; } .im_message_selected .icon-select-tick { @@ -2424,4 +2433,34 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status { } .peer_select_modal_wrap .modal-body { padding: 10px 10px 15px; -} \ No newline at end of file +} + + +/* Colorized user names + +c03d33 red +4fad2d green +d09306 yellow +348cd4 blue +8544d6 purple +cd4073 pink +2996ad sea +ce671b orange + */ +.user_color_1, +.user_color_1:hover {color: #c03d33;} +.user_color_2, +.user_color_2:hover {color: #4fad2d;} +.user_color_3, +.user_color_3:hover {color: #d09306;} +.user_color_4, +.user_color_4:hover {color: #348cd4;} +.user_color_5, +.user_color_5:hover {color: #8544d6;} +.user_color_6, +.user_color_6:hover {color: #cd4073;} +.user_color_7, +.user_color_7:hover {color: #2996ad;} +.user_color_8, +.user_color_8:hover {color: #ce671b;} + diff --git a/app/js/controllers.js b/app/js/controllers.js index 410f7812..30cdbd95 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -509,7 +509,7 @@ angular.module('myApp.controllers', []) } function selectedFlush () { - if (confirm('Are you sure? This can not be undone!') !== true) { + if (safeConfirm('Are you sure? This can not be undone!') !== true) { return false; } AppMessagesManager.flushHistory($scope.curDialog.inputPeer).then(function () { @@ -798,7 +798,7 @@ angular.module('myApp.controllers', []) }; $scope.flushHistory = function () { - if (confirm('Are you sure? This can not be undone!') !== true) { + if (safeConfirm('Are you sure? This can not be undone!') !== true) { return false; } AppMessagesManager.flushHistory(AppPeersManager.getInputPeerByID($scope.userID)).then(function () { @@ -915,7 +915,7 @@ angular.module('myApp.controllers', []) $scope.flushHistory = function () { - if (confirm('Are you sure? This can not be undone!') !== true) { + if (safeConfirm('Are you sure? This can not be undone!') !== true) { return; } AppMessagesManager.flushHistory(AppPeersManager.getInputPeerByID(-$scope.chatID)).then(function () { diff --git a/app/js/directives.js b/app/js/directives.js index 41949e24..29bbd22d 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -658,7 +658,7 @@ angular.module('myApp.directives', ['myApp.filters']) />\ \