Browse Source

Minor design fixes

Closes #608
master
Igor Zhukov 10 years ago
parent
commit
a6fdf8958f
  1. 3
      app/css/app.css
  2. 18
      app/css/desktop.css
  3. 10
      app/js/directives.js
  4. 2
      app/partials/desktop/peer_select.html

3
app/css/app.css

@ -1237,8 +1237,7 @@ a.im_dialog_selected .im_dialog_date {
.im_message_fwd_photo { .im_message_fwd_photo {
width: 34px; width: 34px;
height: 34px; height: 34px;
border-radius: 50%;
border-radius: 2px;
overflow: hidden; overflow: hidden;
} }
.im_message_from_photo .peer_initials, .im_message_from_photo .peer_initials,

18
app/css/desktop.css

@ -336,6 +336,19 @@ a.footer_link.active:active {
color: #FFF; color: #FFF;
} }
.icon-message-status {
pointer-events: none;
background: #6ba2cb;
border: 0;
display: block;
width: 10px;
height: 10px;
border-radius: 7px;
position: absolute;
margin-left: -26px;
margin-top: 13px;
opacity: 0;
}
.im_message_unread .icon-message-status { .im_message_unread .icon-message-status {
opacity: 1.0; opacity: 1.0;
} }
@ -458,6 +471,11 @@ a.footer_link.active:active {
vertical-align: bottom; vertical-align: bottom;
} }
@media (max-height: 600px) {
.footer_wrap {
display: none;
}
}
@media (max-width: 900px) { @media (max-width: 900px) {

10
app/js/directives.js

@ -628,11 +628,11 @@ angular.module('myApp.directives', ['myApp.filters'])
} }
if (attrs.modal) { if (attrs.modal) {
$(element).css({ var height = $($window).height() -
height: $($window).height() - (panelWrap ? panelWrap.offsetHeight : 58) -
(panelWrap ? panelWrap.offsetHeight : 58) - (Config.Mobile ? 46 : 200);
(Config.Mobile ? 46 : 200) height = Math.min(350, height);
}); $(element).css({height: height});
updateScroller(); updateScroller();
return; return;
} }

2
app/partials/desktop/peer_select.html

@ -52,7 +52,7 @@
</div> </div>
<div class="md_modal_footer peer_select_modal_footer clearfix" ng-if="multiSelect"> <div class="md_modal_footer peer_select_modal_footer clearfix" ng-if="multiSelect">
<button class="btn btn-md pull-right" ng-click="submitSelected()" ng-class="{disabled: !selectedCount}" ng-disabled="!selectedCount" my-i18n="conversations_modal_forward_submit"></button> <button class="btn btn-md pull-right" ng-click="submitSelected()" my-i18n="conversations_modal_forward_submit"></button>
<div class="peer_select_modal_recipients_wrap" ng-switch="!selectedCount"> <div class="peer_select_modal_recipients_wrap" ng-switch="!selectedCount">
<span class="peer_select_modal_recipients_empty" ng-switch-when="true" my-i18n="conversations_modal_select_recipients"></span> <span class="peer_select_modal_recipients_empty" ng-switch-when="true" my-i18n="conversations_modal_select_recipients"></span>

Loading…
Cancel
Save