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

Removed unread status-tick

Browse Source 
Closes #895
This commit is contained in:
Igor Zhukov 2015-10-22 15:03:26 +02:00
parent fd537bcb3d
commit 4459b8d799
4 changed files with 8 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/less/desktop.less
View File

@ -1059,49 +1059,6 @@ a.footer_link.active:active {
} }
} }
@media (max-width: 900px) {
/* Status ticks */
.icon-message-status,
.im_message_error_btn,
.icon-message-status-tick {
display: none;
}
.im_message {
&_out {
.icon-message-status-tick {
display: inline-block;
width: 16px;
height: 10px;
top: 2px;
position: relative;
.image-2x('../img/icons/Checks2.png', 16px, 10px);
background-size: 16px 10px;
background-position: 0 0;
}
}
&_pending {
.icon-message-status-tick {
display: none;
}
}
&_unread {
.icon-message-status-tick {
.image-2x('../img/icons/Checks1.png', 16px, 10px);
background-size: 16px 10px;
background-position: 0 0;
}
}
&_date {
padding: 0;
}
}
}
.im_message_fwd { .im_message_fwd {
&_author_wrap { &_author_wrap {
margin: 1px 0 4px; margin: 1px 0 4px;

6
app/less/mobile.less
View File

@ -892,7 +892,7 @@ a.im_message_from_photo {
.im_message_out { .im_message_out {
.icon-message-status-tick { .icon-message-status {
border: 0; border: 0;
display: inline-block; display: inline-block;
width: 10px; width: 10px;
@ -909,13 +909,13 @@ a.im_message_from_photo {
} }
.im_message_unread { .im_message_unread {
.icon-message-status-tick { .icon-message-status {
background: #43A4DB; background: #43A4DB;
} }
} }
.im_message_pending { .im_message_pending {
.icon-message-status-tick { .icon-message-status {
background: #9fd2ee; background: #9fd2ee;
} }
} }

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

@ -29,13 +29,11 @@
<a class="im_message_error_btn" ng-if="::historyMessage.pending || historyMessage.error || false" ng-click="historyMessage.send()"> <a class="im_message_error_btn" ng-if="::historyMessage.pending || historyMessage.error || false" ng-click="historyMessage.send()">
<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 &amp;&amp; historyMessage.out || historyMessage.pending || false" class="icon-message-status" 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.fromID" img-class="im_message_from_photo"></a> <a class="im_message_from_photo pull-left" my-peer-photolink="::historyMessage.fromID" img-class="im_message_from_photo"></a>
<div class="im_message_meta pull-right text-right"> <div class="im_message_meta pull-right text-right">
<i class="icon-message-status-tick"></i>
<span class="im_message_date" ng-bind="::historyMessage.date | time"></span> <span class="im_message_date" ng-bind="::historyMessage.date | time"></span>
</div> </div>

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

@ -24,12 +24,14 @@
</div> </div>
<div ng-switch-default class="im_content_message_wrap" ng-class="::[historyMessage.out ? 'im_message_out' : 'im_message_in', historyMessage.fwdFromID ? 'im_message_fwd' : '']"> <div ng-switch-default class="im_content_message_wrap" ng-class="::[historyMessage.out ? 'im_message_out' : 'im_message_in', historyMessage.fwdFromID ? 'im_message_fwd' : '']">
<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.fromID" img-class="im_message_from_photo"></a> <a class="im_message_from_photo pull-left" my-peer-photolink="::historyMessage.fromID" img-class="im_message_from_photo"></a>
<div class="im_message_meta"> <div class="im_message_meta">
<i class="icon-message-status-tick"></i> <a class="im_message_error_btn" ng-if="::historyMessage.pending || historyMessage.error || false" ng-click="historyMessage.send()">
<i class="icon-message-status" tooltip="Try again"></i>
</a>
<i ng-if="::historyMessage.unread &amp;&amp; historyMessage.out || historyMessage.pending || false" class="icon-message-status" ng-show="!historyMessage.error"></i>
<span class="im_message_date" ng-bind="::historyMessage.date | time"></span> <span class="im_message_date" ng-bind="::historyMessage.date | time"></span>
</div> </div>