Browse Source

Style fixes, now display full user name in group history

master
Igor Zhukov 11 years ago
parent
commit
b255481c03
  1. 8
      app/css/app.css
  2. 4
      app/partials/im.html
  3. 5
      app/partials/message.html

8
app/css/app.css

@ -74,7 +74,6 @@ input[type="number"]::-webkit-inner-spin-button {
.btn-tg { .btn-tg {
color: #ffffff; color: #ffffff;
background-color: #6AC065; background-color: #6AC065;
/*58b152*/
border-color: #6AC065; border-color: #6AC065;
} }
@ -686,11 +685,12 @@ a.im_dialog:hover .im_dialog_date {
padding: 10px 4px 0; padding: 10px 4px 0;
} }
.im_history_panel_title h4 { .im_history_panel_title h4 {
margin-bottom: 7px;
font-size: 17px; font-size: 17px;
line-height: 20px;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
margin: 8px 0 6px;
} }
.im_history_panel_title h4 small { .im_history_panel_title h4 small {
color: #999; color: #999;
@ -703,11 +703,11 @@ a.im_dialog:hover .im_dialog_date {
.im_history_panel_media_dropdown .dropdown-toggle { .im_history_panel_media_dropdown .dropdown-toggle {
font-size: 13px; font-size: 13px;
font-weight: normal; font-weight: normal;
padding-top: 4px; padding-top: 5px;
line-height: 1; line-height: 1;
} }
.im_history_panel_media_dropdown { .im_history_panel_media_dropdown {
padding-top: 1px; padding-top: 2px;
} }
.im_history_panel_edit_link, .im_history_panel_edit_link,
.im_history_panel_return_link, .im_history_panel_return_link,

4
app/partials/im.html

@ -41,7 +41,7 @@
<a ng-click="toggleMedia('photos')">Photos</a> <a ng-click="toggleMedia('photos')">Photos</a>
</li> </li>
<li> <li>
<a ng-click="toggleMedia('video')">Video</a> <a ng-click="toggleMedia('video')">Videos</a>
</li> </li>
<li> <li>
<a ng-click="toggleMedia('documents')">Documents</a> <a ng-click="toggleMedia('documents')">Documents</a>
@ -55,7 +55,7 @@
<h4 ng-if="mediaType !== false" ng-switch="mediaType"> <h4 ng-if="mediaType !== false" ng-switch="mediaType">
<span ng-switch-when="photos"> Photos </span> <span ng-switch-when="photos"> Photos </span>
<span ng-switch-when="video"> Video </span> <span ng-switch-when="video"> Videos </span>
<span ng-switch-when="documents"> Documents </span> <span ng-switch-when="documents"> Documents </span>
</h4> </h4>

5
app/partials/message.html

@ -6,7 +6,7 @@
<div class="im_service_message_wrap" ng-if="historyMessage._ == 'messageService'"> <div class="im_service_message_wrap" ng-if="historyMessage._ == 'messageService'">
<div class="im_service_message"> <div class="im_service_message">
<a ng-click="openUser(historyMessage.from_id)" class="im_message_author" ng-bind-html="historyMessage.fromUser.rFirstName"></a> <a ng-click="openUser(historyMessage.from_id)" class="im_message_author" ng-bind-html="historyMessage.fromUser.rFullName"></a>
<span class="im_message_service" ng-switch="historyMessage.action['_']"> <span class="im_message_service" ng-switch="historyMessage.action['_']">
<span ng-switch-when="messageActionChatCreate"> <span ng-switch-when="messageActionChatCreate">
@ -78,7 +78,8 @@
<div class="im_message_body"> <div class="im_message_body">
<a class="im_message_author" ng-click="openUser(historyMessage.from_id)" ng-bind-html="historyMessage.fromUser.rFirstName"></a> <a class="im_message_author" ng-click="openUser(historyMessage.from_id)" ng-bind-html="historyMessage.fromUser.rFullName" ng-if="historyMessage.to_id.chat_id > 0"></a>
<a class="im_message_author" ng-click="openUser(historyMessage.from_id)" ng-bind-html="historyMessage.fromUser.rFirstName" ng-if="!historyMessage.to_id.chat_id"></a>
<div class="im_message_fwd_header" ng-if="historyMessage._ == 'messageForwarded'"> <div class="im_message_fwd_header" ng-if="historyMessage._ == 'messageForwarded'">

Loading…
Cancel
Save