r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed active inverted state for dialogs

Browse Source
This commit is contained in:
Igor Zhukov 2014-06-27 22:39:35 +04:00
parent 2249b80ea5
commit e7676ebde5
3 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/css/app.css
View File

@ -944,13 +944,10 @@ a.tg_radio_on:hover i.icon-radio {
border-radius: 2px;
background: #f2f6fa;
}
.im_dialogs_scrollable_wrap .im_dialog_wrap:active a.im_dialog,
.im_dialogs_scrollable_wrap .active a.im_dialog {
border-radius: 2px;
background-color: #6490b1;
}
.im_dialogs_scrollable_wrap .im_dialog_wrap:active a.im_dialog:hover,
.im_dialogs_scrollable_wrap .im_dialog_wrap:active a.im_dialog_selected,
.im_dialogs_scrollable_wrap .active a.im_dialog:hover,
.im_dialogs_scrollable_wrap .active a.im_dialog_selected {
background-color: #6490b1;
@ -978,10 +975,6 @@ a.im_dialog_selected .im_dialog_message_text {
color: #698192;
}
.im_dialog_wrap:active a.im_dialog .im_dialog_chat_from_wrap,
.im_dialog_wrap:active a.im_dialog .im_dialog_message_media,
.im_dialog_wrap:active a.im_dialog .im_dialog_message_service,
.im_dialog_wrap:active a.im_dialog .im_dialog_message_text,
.active a.im_dialog .im_dialog_chat_from_wrap,
.active a.im_dialog .im_dialog_message_media,
.active a.im_dialog .im_dialog_message_service,
@ -1002,7 +995,6 @@ a.im_dialog_selected .im_dialog_message_text {
margin-top: 2px;
margin-bottom: 2px;
}
.im_dialog_wrap:active .im_dialog_peer,
.active .im_dialog_peer {
color: #FFF;
}
@ -1014,7 +1006,6 @@ a.im_dialog_selected .im_dialog_message_text {
padding: 3px 4px;
margin-top: 4px;
}
.im_dialog_wrap:active .im_dialog_badge,
.active .im_dialog_badge {
color: #428bca;
background-color: #fff;
@ -1038,7 +1029,6 @@ a.im_dialog:hover .im_dialog_unread,
a.im_dialog_selected .im_dialog_unread {
background: #a3c0d4;
}
.im_dialog_wrap:active .im_dialog_unread,
.active .im_dialog_unread {
background-color: #a4c4dd;
}
@ -1052,9 +1042,6 @@ a.im_dialog:hover .im_dialog_date,
a.im_dialog_selected .im_dialog_date {
color: #91a6ba;
}
.im_dialog_wrap:active .im_dialog_date,
.im_dialog_wrap:active a.im_dialog:hover .im_dialog_date,
.im_dialog_wrap:active a.im_dialog_selected .im_dialog_date,
.active .im_dialog_date,
.active a.im_dialog:hover .im_dialog_date,
.active a.im_dialog_selected .im_dialog_date {

9
app/css/app_mobile.css
View File

@ -356,18 +356,11 @@ html {
.im_dialog_peer {
margin-bottom: 5px;
}
.im_dialogs_scrollable_wrap a.im_dialog:hover,
.im_dialogs_scrollable_wrap a.im_dialog_selected {
border-top-color: #D6DADE;
border-bottom-color: #D6DADE;
}
.im_dialogs_scrollable_wrap .im_dialog_wrap:active a.im_dialog,
.im_dialogs_scrollable_wrap .active a.im_dialog {
border-top-color: #6490b1;
border-bottom-color: #6490b1;
}
.im_dialogs_scrollable_wrap .active + li a.im_dialog,
.im_dialogs_scrollable_wrap li:hover + li a.im_dialog {
.im_dialogs_scrollable_wrap .active + li a.im_dialog {
margin-top: 0;
border-top: 0;
}

9
app/js/directives.js
View File

@ -507,7 +507,7 @@ angular.module('myApp.directives', ['myApp.filters'])
scrollableWrap.scrollHeight; // Some strange Chrome bug workaround
$(scrollable).css({bottom: -(sh - st - ch)});
onContentLoaded(function () {
var upd = function () {
$(scrollableWrap).removeClass('im_history_to_bottom');
$(scrollable).css({bottom: ''});
scrollableWrap.scrollTop = st + scrollableWrap.scrollHeight - sh;
@ -520,7 +520,12 @@ angular.module('myApp.directives', ['myApp.filters'])
$(scrollableWrap).trigger('scroll');
}
});
});
clearTimeout(timer);
unreg();
},
timer = setTimeout(upd, 0),
unreg = $scope.$on('$viewContentLoaded', upd);
});
$scope.$on('ui_history_append', function () {