Browse Source

Fixed mobile transitions

master
Igor Zhukov 9 years ago
parent
commit
87f82fcbc1
  1. 5
      app/less/mobile.less
  2. 8
      app/partials/mobile/head.html
  3. 4
      app/partials/mobile/im.html

5
app/less/mobile.less

@ -226,6 +226,11 @@ html {
.tg_modal_head .navbar-search-wrap { .tg_modal_head .navbar-search-wrap {
display: block; display: block;
} }
.tg_head_peer_menu_wrap {
.navbar_peer_not_selected & {
display: none;
}
}
.tg_page_head { .tg_page_head {
.navbar-quick-nav { .navbar-quick-nav {

8
app/partials/mobile/head.html

@ -5,20 +5,20 @@
<a class="navbar-peer-wrap" my-peer-photolink="historyPeer.id" peer-watch="true"></a> <a class="navbar-peer-wrap" my-peer-photolink="historyPeer.id" peer-watch="true"></a>
<div class="navbar-toggle-wrap dropdown" dropdown> <div class="navbar-toggle-wrap dropdown" dropdown ng-switch="!curDialog.peer">
<a class="dropdown-toggle navbar-toggle" dropdown-toggle> <a class="dropdown-toggle navbar-toggle" dropdown-toggle>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<ul ng-if="!curDialog.peer" class="dropdown-menu"> <ul ng-switch-when="true" class="dropdown-menu">
<li><a ng-click="openGroup()" my-i18n="head_new_group"></a></li> <li><a ng-click="openGroup()" my-i18n="head_new_group"></a></li>
<li><a ng-click="importContact()" my-i18n="head_new_contact"></a></li> <li><a ng-click="importContact()" my-i18n="head_new_contact"></a></li>
<li ng-if="!isEmpty.contacts"><a ng-click="openContacts()" my-i18n="head_contacts"></a></li> <li ng-if="!isEmpty.contacts"><a ng-click="openContacts()" my-i18n="head_contacts"></a></li>
<li><a ng-click="openSettings()" my-i18n="head_settings"></a></li> <li><a ng-click="openSettings()" my-i18n="head_settings"></a></li>
<li><a ng-click="logOut()" my-i18n="head_log_out"></a></li> <li><a ng-click="logOut()" my-i18n="head_log_out"></a></li>
</ul> </ul>
<ul ng-if="curDialog.peer" class="dropdown-menu"> <ul ng-switch-default class="dropdown-menu">
<li><a ng-click="toggleEdit()" my-i18n="head_edit_messages"></a></li> <li><a ng-click="toggleEdit()" my-i18n="head_edit_messages"></a></li>
<li ng-if="!historyFilter.mediaType" class="divider"></li> <li ng-if="!historyFilter.mediaType" class="divider"></li>
<li ng-if="!historyFilter.mediaType"><a ng-click="toggleMedia('photos')" my-i18n="head_media_photos"></a></li> <li ng-if="!historyFilter.mediaType"><a ng-click="toggleMedia('photos')" my-i18n="head_media_photos"></a></li>
@ -38,7 +38,7 @@
<span class="tg_head_logo"></span></a> <span class="tg_head_logo"></span></a>
<div ng-show="curDialog.peer" ng-switch="curDialog.peer &amp;&amp; historyFilter.mediaType.length > 0"> <div class="tg_head_peer_menu_wrap" ng-switch="curDialog.peer &amp;&amp; historyFilter.mediaType.length > 0">
<ul ng-switch-when="true" class="nav navbar-nav navbar-quick-nav"> <ul ng-switch-when="true" class="nav navbar-nav navbar-quick-nav">
<li> <li>
<a ng-click="toggleMedia()" class="navbar-quick-media-back"> <a ng-click="toggleMedia()" class="navbar-quick-media-back">

4
app/partials/mobile/im.html

@ -77,11 +77,11 @@
<div class="im_history_col_wrap" ng-controller="AppImHistoryController" ng-class="{im_history_loaded: state.loaded}"> <div class="im_history_col_wrap" ng-controller="AppImHistoryController" ng-class="{im_history_loaded: state.loaded}">
<div ng-show="!state.notSelected &amp;&amp; !state.loaded" class="im_history_not_selected" my-vertical-position="0.35" padding="true"> <div class="im_history_not_selected_wrap im_history_not_selected" my-vertical-position="0.35" padding="true">
<my-i18n msgid="im_loading_history"></my-i18n><span my-loading-dots></span> <my-i18n msgid="im_loading_history"></my-i18n><span my-loading-dots></span>
</div> </div>
<div ng-show="!state.notSelected &amp;&amp; state.loaded"> <div class="im_history_selected_wrap">
<div my-history-mobile class="im_history_col"> <div my-history-mobile class="im_history_col">
<div class="im_history_wrap im_history_scrollable_wrap mobile_scrollable_wrap"> <div class="im_history_wrap im_history_scrollable_wrap mobile_scrollable_wrap">

Loading…
Cancel
Save