flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-07-22 17:35:52 +00:00
Code Issues Releases Wiki Activity

Fix remaining CSS issues

Browse Source
This commit is contained in:
Loic Blot 2018-11-11 12:07:47 +01:00
parent d87259366f
commit 95749f6d20
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
css/style.css
View File

@ -4,15 +4,11 @@
} }
#app-navigation { #app-navigation {
min-width: 20em;
box-sizing: border-box; box-sizing: border-box;
border-left: 1px solid #ddd; border-left: 1px solid #ddd;
border-right: 1px solid #ddd; border-right: 1px solid #ddd;
resize: horizontal; overflow-x: auto;
position: relative;
flex: 1; flex: 1;
top: 0;
height: 100vh;
} }
/* Navigation: folder like structure */ /* Navigation: folder like structure */
#app-mailbox-peers { #app-mailbox-peers {
@ -62,13 +58,6 @@
text-align: center; text-align: center;
} }
#app-conversation {
height: 100vh;
overflow-y: auto;
flex: 5;
flex-direction: column;
}
#app-content-wrapper { #app-content-wrapper {
padding: 15px; padding: 15px;
min-width: auto !important; min-width: auto !important;

6
js/devel/conversation.js
View File

@ -9,7 +9,7 @@
*/ */
var Conversation = new Vue({ var Conversation = new Vue({
el: '#app-conversation', el: '#app-content',
data: { data: {
selectedContact: {}, selectedContact: {},
isConvLoading: false, isConvLoading: false,
@ -54,7 +54,7 @@ var Conversation = new Vue({
self.totalMessageCount = jsondata['msgCount'] !== undefined ? jsondata['msgCount'] : 0; self.totalMessageCount = jsondata['msgCount'] !== undefined ? jsondata['msgCount'] : 0;
self.isConvLoading = false; self.isConvLoading = false;
$('#app-conversation').scrollTop(1E10); $('#app-content').scrollTop(1E10);
// If refreshInterval is already bound, clear previous // If refreshInterval is already bound, clear previous
if (self.refreshIntervalId !== null) { if (self.refreshIntervalId !== null) {
@ -76,7 +76,7 @@ var Conversation = new Vue({
var fmt = self.formatConversation(jsondata); var fmt = self.formatConversation(jsondata);
var conversationBuf = fmt[1]; var conversationBuf = fmt[1];
if (conversationBuf === true) { if (conversationBuf === true) {
$('#app-conversation').scrollTop(1E10); $('#app-content').scrollTop(1E10);
// This will blink the tab because there is new messages // This will blink the tab because there is new messages
if (document.hasFocus() === false) { if (document.hasFocus() === false) {
Sms.unreadCountCurrentConv += parseInt(fmt[0]); Sms.unreadCountCurrentConv += parseInt(fmt[0]);

2
templates/main.php
View File

@ -106,7 +106,7 @@ use \OCA\OcSms\Lib\CountryCodes;
</div> </div>
</div> </div>
<div id="app-conversation"> <div id="app-content">
<div id="app-content-loader" class="icon-loading" v-if="isConvLoading"></div> <div id="app-content-loader" class="icon-loading" v-if="isConvLoading"></div>
<div id="app-content-header" v-if="!isConvLoading && messages.length > 0" v-bind:style="{backgroundColor: getContactColor(selectedContact.uid) }"> <div id="app-content-header" v-if="!isConvLoading && messages.length > 0" v-bind:style="{backgroundColor: getContactColor(selectedContact.uid) }">
<div id="ocsms-contact-avatar"> <div id="ocsms-contact-avatar">