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

Style improvements

Browse Source
This commit is contained in:
Igor Zhukov 2015-03-23 00:52:41 +03:00
parent fa149c09c8
commit 3af94056fb
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/js/directives.js
View File

@ -141,7 +141,7 @@ angular.module('myApp.directives', ['myApp.filters'])
applyUnreadAfter(); applyUnreadAfter();
deregisterUnreadAfter = $scope.$on('messages_unread_after', applyUnreadAfter); deregisterUnreadAfter = $scope.$on('messages_unread_after', applyUnreadAfter);
} }
if ($scope.historyMessage.unread) { if ($scope.historyMessage.unread && $scope.historyMessage.out) {
element.addClass(unreadClass); element.addClass(unreadClass);
var deregisterUnread = $scope.$on('messages_read', function () { var deregisterUnread = $scope.$on('messages_read', function () {
if (!$scope.historyMessage.unread) { if (!$scope.historyMessage.unread) {

4
app/less/desktop.less
View File

@ -815,7 +815,7 @@ a.footer_link.active:active {
&_edit_reply_btn { &_edit_reply_btn {
border-radius: 2px; border-radius: 2px;
padding: 7px 17px; padding: 7px 17px;
font-weight: normal; font-weight: bold;
font-size: 12px; font-size: 12px;
line-height: 18px; line-height: 18px;
margin: 6px 0 6px 14px; margin: 6px 0 6px 14px;
@ -1306,7 +1306,7 @@ a.im_panel_peer_photo .peer_initials {
} }
} }
@media (max-height: 700px) { @media (max-height: 600px) {
a { a {
&.im_panel_peer_photo, &.im_panel_peer_photo,
&.im_panel_own_photo { &.im_panel_own_photo {

2
app/partials/desktop/message.html
View File

@ -28,7 +28,7 @@
<i class="icon-message-status" tooltip="Try again"></i> <i class="icon-message-status" tooltip="Try again"></i>
</a> </a>
<i ng-if="::historyMessage.unread || historyMessage.pending || false" class="icon-message-status" ng-class="{'icon-message-status-unread': historyMessage.unread, 'icon-message-status-pending': historyMessage.pending}" ng-show="!historyMessage.error"></i> <i ng-if="::historyMessage.unread &amp;&amp; historyMessage.out || historyMessage.pending || false" class="icon-message-status" ng-class="{'icon-message-status-unread': historyMessage.unread, 'icon-message-status-pending': historyMessage.pending}" ng-show="!historyMessage.error"></i>
<a class="im_message_from_photo pull-left" my-peer-photolink="::historyMessage.from_id" img-class="im_message_from_photo"></a> <a class="im_message_from_photo pull-left" my-peer-photolink="::historyMessage.from_id" img-class="im_message_from_photo"></a>

2
app/partials/mobile/message.html
View File

@ -20,7 +20,7 @@
</div> </div>
<div ng-switch-default class="im_content_message_wrap" ng-class="::[historyMessage.out ? 'im_message_out' : 'im_message_in']"> <div ng-switch-default class="im_content_message_wrap" ng-class="::[historyMessage.out ? 'im_message_out' : 'im_message_in']">
<i ng-if="::historyMessage.unread || historyMessage.pending || false" class="icon-message-status" ng-class="{'icon-message-status-unread': historyMessage.unread, 'icon-message-status-pending': historyMessage.pending}" ng-show="!historyMessage.error"></i> <i ng-if="::historyMessage.unread &amp;&amp; historyMessage.out || historyMessage.pending || false" class="icon-message-status" ng-class="{'icon-message-status-unread': historyMessage.unread, 'icon-message-status-pending': historyMessage.pending}" ng-show="!historyMessage.error"></i>
<a class="im_message_from_photo pull-left" my-user-photolink="historyMessage.from_id" img-class="im_message_from_photo"></a> <a class="im_message_from_photo pull-left" my-user-photolink="historyMessage.from_id" img-class="im_message_from_photo"></a>