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

Improve search styles

Browse Source
This commit is contained in:
Igor Zhukov 2014-06-13 16:26:14 +04:00
parent 4d04810428
commit ed69c39849
2 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/css/app.css
View File

@ -957,17 +957,8 @@ a.tg_radio_on:hover i.icon-radio {
} }
.im_dialogs_tabs_wrap { .im_dialogs_tabs_wrap {
overflow: hidden; display: none;
height: 0;
-webkit-transition : height ease-out 0.3s;
-moz-transition : height ease-out 0.3s;
-o-transition : height ease-out 0.3s;
transition : height ease-out 0.3s;
} }
.im_dialogs_tabs_wrap.shown {
height: 38px;
}
.im_dialogs_tabs { .im_dialogs_tabs {
padding: 4px 0; padding: 4px 0;
position: relative; position: relative;
@ -2977,17 +2968,10 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status {
.is_1x .icon-delete { .is_1x .icon-delete {
background-image: url(../img/icons/IconsetW_1x.png); background-image: url(../img/icons/IconsetW_1x.png);
} }
.im_message_selected { .im_message_selected,
.im_message_focus {
background: #f2f6fa; background: #f2f6fa;
} }
.im_message_focus {
background-color: #f2f6fa;
-webkit-transition: background-color linear 1s;
transition: background-color linear 1s;
}
/*.im_message_focus.inactive {
background-color: none;
}*/
.im_history_selectable .im_message_outer_wrap { .im_history_selectable .im_message_outer_wrap {
cursor: pointer; cursor: pointer;
@ -2995,11 +2979,15 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status {
.im_history_selectable .im_message_outer_wrap:hover { .im_history_selectable .im_message_outer_wrap:hover {
background: #f2f6fa; background: #f2f6fa;
} }
.im_message_selected .im_message_date, .im_message_selected .im_message_date,
.im_message_selected .im_message_fwd_header, .im_message_selected .im_message_fwd_header,
.im_message_selected .im_message_document_size,
.im_message_focus .im_message_date,
.im_message_focus .im_message_fwd_header,
.im_message_focus .im_message_document_size,
.im_history_selectable .im_message_outer_wrap:hover .im_message_date, .im_history_selectable .im_message_outer_wrap:hover .im_message_date,
.im_history_selectable .im_message_outer_wrap:hover .im_message_fwd_header, .im_history_selectable .im_message_outer_wrap:hover .im_message_fwd_header,
.im_message_selected .im_message_document_size,
.im_history_selectable .im_message_outer_wrap:hover .im_message_document_size { .im_history_selectable .im_message_outer_wrap:hover .im_message_document_size {
color: #68839c; color: #68839c;
} }

17
app/js/directives.js
View File

@ -54,17 +54,8 @@ angular.module('myApp.directives', ['myApp.filters'])
attrs.$observe('hasTabs', function (newValue) { attrs.$observe('hasTabs', function (newValue) {
newValue = newValue == 'true'; newValue = newValue == 'true';
if (newValue) { $(tabsWrap).toggle(newValue);
$scope.$broadcast('ui_dialogs_tabs', true); $scope.$broadcast('ui_dialogs_tabs', newValue);
}
var trigger = function () {
$(tabsWrap)[newValue ? 'addClass' : 'removeClass']('shown');
}
$transition($(tabsWrap), trigger).then(function () {
if (!newValue) {
$scope.$broadcast('ui_dialogs_tabs', false);
}
});
}); });
$(document).on('keydown', onKeyDown); $(document).on('keydown', onKeyDown);
@ -180,8 +171,7 @@ angular.module('myApp.directives', ['myApp.filters'])
.directive('myDialogsList', function($window, $timeout) { .directive('myDialogsList', function($window, $timeout) {
return { return {
link: link, link: link
scope: true
}; };
@ -489,6 +479,7 @@ angular.module('myApp.directives', ['myApp.filters'])
$scope.$on('ui_history_append', function () { $scope.$on('ui_history_append', function () {
var sh = scrollableWrap.scrollHeight; var sh = scrollableWrap.scrollHeight;
onContentLoaded(function () { onContentLoaded(function () {
atBottom = false;
updateBottomizer(); updateBottomizer();
lessNotified = false; lessNotified = false;