Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit 284da8d

Browse files
committed
by default, modals will not cover chat
1 parent b1f376f commit 284da8d

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

css/obBase.css

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,13 +1039,20 @@ label.fieldItem {
10391039
height: 100%;
10401040
top: 0;
10411041
left: 0;
1042-
right: 0;
1043-
/* use fadeIn and fadeOut to change opacity */
1044-
transition: opacity .05s cubic-bezier(0, 0, 0.2, 1);
1042+
transition: opacity .05s cubic-bezier(0, 0, 0.2, 1),
1043+
width 0.5s ease;
10451044
padding-top: 25px;
10461045
z-index: 1;
10471046
}
10481047

1048+
#ov1.chatLoaded .modal:not(.modal-cover-fullscreen) {
1049+
width: calc(100% - 45px);
1050+
}
1051+
1052+
#ov1.chatOpen .modal:not(.modal-cover-fullscreen) {
1053+
width: calc(100% - 230px);
1054+
}
1055+
10491056
.modal.modal-navOffset {
10501057
top: 50px;
10511058
}
@@ -1073,11 +1080,6 @@ label.fieldItem {
10731080
height: 574px;
10741081
}
10751082

1076-
#ov1.chatOpen .modal-child {
1077-
right: 230px;
1078-
}
1079-
1080-
10811083
.modal.modal-navOffset .modal-child {
10821084
margin-top: 25px;
10831085
}

index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ <h2 class="ion-android-close custCol-text clickable"></h2>
4242
</div>
4343
<div id="statusBar"></div>
4444
<div id="pageNav" class="bar navBar navBar-main custCol-secondary padding0"></div>
45-
<!-- the loading modal must be on top of the page nav or the reload button is hidden -->
46-
<div id="loadingModal" class="modal modal-opaque js-loadingModal top0 hide">
45+
<div id="loadingModal" class="modal modal-opaque modal-cover-fullscreen js-loadingModal hide">
4746
<div class="spinner-with-logo fullCentered">
4847
<i class="ion-android-sync spinner fontSize30 spinner-with-logo-icon"></i>
4948
</div>

js/start.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,8 @@ var loadProfile = function(landingRoute, onboarded) {
385385

386386
$('#sideBar').html(app.chatVw.render().el);
387387

388+
$('html').addClass('chatLoaded navBarLoaded');
389+
388390
app.router = new router({userModel: user, userProfile: userProfile, socketView: newSocketView});
389391

390392
if (externalRoute) {

js/views/chatVw.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ module.exports = baseVw.extend({
204204
this.slideOut();
205205

206206
// mark as read
207-
// $.post(app.serverConfigs.getActive().getServerBaseUrl() + '/mark_chat_message_as_read', { guid: model.get('guid') });
208207
this.markConvoAsRead(model.get('guid'));
209208

210209
// mark as read on chat head

0 commit comments

Comments
 (0)