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

Commit 1840f97

Browse files
committed
merging in #1450
2 parents 6fc8f98 + e9e8d4f commit 1840f97

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

css/obBase.css

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,13 +1058,20 @@ label.fieldItem {
10581058
height: 100%;
10591059
top: 0;
10601060
left: 0;
1061-
right: 0;
1062-
/* use fadeIn and fadeOut to change opacity */
1063-
transition: opacity .05s cubic-bezier(0, 0, 0.2, 1);
1061+
transition: opacity .05s cubic-bezier(0, 0, 0.2, 1),
1062+
width 0.5s ease;
10641063
padding-top: 25px;
10651064
z-index: 1;
10661065
}
10671066

1067+
#ov1.chatLoaded .modal:not(.modal-cover-fullscreen) {
1068+
width: calc(100% - 45px);
1069+
}
1070+
1071+
#ov1.chatOpen .modal:not(.modal-cover-fullscreen) {
1072+
width: calc(100% - 230px);
1073+
}
1074+
10681075
.modal.modal-navOffset {
10691076
top: 50px;
10701077
}
@@ -1092,11 +1099,6 @@ label.fieldItem {
10921099
height: 574px;
10931100
}
10941101

1095-
#ov1.chatOpen .modal-child {
1096-
right: 230px;
1097-
}
1098-
1099-
11001102
.modal.modal-navOffset .modal-child {
11011103
margin-top: 25px;
11021104
}
@@ -1495,6 +1497,10 @@ h5 {
14951497
top: 50px;
14961498
}
14971499
1500+
.modal-cover-fullscreen.modal.modal-navOffset .modal-childMain {
1501+
top: 0;
1502+
}
1503+
14981504
.modal-childMain {
14991505
border-radius: 3px;
15001506
background-color: #327eb8;
@@ -3838,10 +3844,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
38383844
padding-top: 1px;
38393845
}
38403846
3841-
#ov1.chatOpen .spinner-with-logo {
3842-
left: calc(50% - 115.5px);
3843-
}
3844-
38453847
.spinnerWrapper {
38463848
transition: opacity 1s;
38473849
}
@@ -4689,10 +4691,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
46894691
transition: transform 0.5s ease;
46904692
}
46914693

4692-
#ov1.chatOpen .page-connect-modal .content {
4693-
transform: translateX(-115.5px);
4694-
}
4695-
46964694
.page-connect-modal .content .btn {
46974695
float: none;
46984696
}

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ <h2 class="ion-android-close custCol-text clickable"></h2>
4444
<div id="pageNav" class="bar navBar navBar-main custCol-secondary padding0"></div>
4545
<div id="appBar" class="top0 alignCenter custCol-secondary"></div>
4646
<!-- the loading modal must be on top of the page nav or the reload button is hidden -->
47-
<div id="loadingModal" class="modal modal-opaque js-loadingModal top0 hide">
47+
<div id="loadingModal" class="modal modal-opaque modal-cover-fullscreen js-loadingModal hide">
4848
<div class="spinner-with-logo fullCentered">
4949
<i class="ion-android-sync spinner fontSize30 spinner-with-logo-icon"></i>
5050
</div>

js/start.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,7 @@ var loadProfile = function(landingRoute, onboarded) {
406406
});
407407

408408
$('#sideBar').html(app.chatVw.render().el);
409+
$('html').addClass('chatLoaded');
409410

410411
app.router = new router({userModel: user, userProfile: userProfile, socketView: newSocketView});
411412

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)