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

Fixed sessions list styles

Browse Source
This commit is contained in:
Igor Zhukov 2015-05-19 15:05:29 +03:00
parent 9c1e3f7d43
commit a5c2d9962a
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/js/directives.js
View File

@ -914,8 +914,8 @@ angular.module('myApp.directives', ['myApp.filters'])
function updateSizes () {
$(element).css({
height: $($window).height()
- (Config.Mobile ? 46 + 18 : 200)
height: Math.min(760, $($window).height()
- (Config.Mobile ? 46 + 18 : 200))
});
$(sessionsWrap).nanoScroller();
}

15
app/less/app.less
View File

@ -2863,7 +2863,7 @@ a.contacts_modal_contact:hover .md_modal_list_peer_description,
.sessions_modal {
&_session {
padding: 8px 16px;
padding: 8px 24px;
}
&_sessions_header {
color: #999;
@ -2873,12 +2873,12 @@ a.contacts_modal_contact:hover .md_modal_list_peer_description,
font-weight: bold;
}
&_terminate_all_wrap {
margin: 5px 0 5px;
text-align: center;
margin: 5px 0 0 24px;
}
}
.sessions_modal_sessions_list {
margin-bottom: 20px;
padding: 14px 0 10px;
margin-bottom: 10px;
}
.session_active_date_online {
color: #3a6d99;
@ -2898,7 +2898,8 @@ a.contacts_modal_contact:hover .md_modal_list_peer_description,
text-align: right;
}
.session_terminate_btn {
margin-top: 17px;
margin-top: 24px;
display: inline-block;
}
.sessions_modal_session_app {
font-weight: bold;
@ -2912,6 +2913,10 @@ a.contacts_modal_contact:hover .md_modal_list_peer_description,
color: #777;
}
.sessions_modal_other_splitter {
margin: 15px 0 20px 24px;
}
.modal-dialog {
.md_simple_modal_window &,
.confirm_modal_window &,

11
app/partials/desktop/sessions_list_modal.html
View File

@ -25,17 +25,14 @@
<ul ng-switch-default class="sessions_modal_sessions_list nav nav-pills nav-stacked">
<li class="sessions_modal_session_wrap clearfix" ng-repeat="authorization in authorizations | limitTo: slice.limit track by authorization.hash">
<div ng-if="authorization.current">
<h5 class="sessions_modal_sessions_header" my-i18n="sessions_modal_current_session"></h5>
</div>
<div class="sessions_modal_session">
<div class="session_meta_wrap pull-right">
<div class="session_active_date" ng-switch="authorization.current">
<span ng-switch-when="true" class="session_active_date_online" my-i18n="sessions_modal_session_online"></span>
<span ng-switch-when="true" class="session_active_date_online" my-i18n="sessions_modal_current_session"></span>
<span ng-switch-default ng-bind="authorization.date_active | dateOrTime"></span>
</div>
<a ng-if="!authorization.current" class="session_terminate_btn btn btn-md" ng-click="terminateSession(authorization.hash)" my-i18n="sessions_modal_terminate_one"></a>
<a ng-if="!authorization.current" class="session_terminate_btn" ng-click="terminateSession(authorization.hash)" my-i18n="sessions_modal_terminate_one"></a>
</div>
<div class="sessions_modal_session_app" ng-bind="authorization.app_name + ' ' + authorization.app_version"></div>
@ -44,10 +41,10 @@
</div>
<div ng-if="authorization.current && authorizations.length > 1">
<div class="sessions_modal_terminate_all_wrap">
<button class="btn btn-md btn-md-danger" ng-click="terminateAllSessions()" my-i18n="sessions_modal_terminate_all"></button>
<a ng-click="terminateAllSessions()" my-i18n="sessions_modal_terminate_all"></a>
</div>
<h5 class="sessions_modal_sessions_header" my-i18n="sessions_modal_active_sessions"></h5>
<hr class="sessions_modal_other_splitter"></hr>
</div>
</li>