diff --git a/css/style.css b/css/style.css index 103906e..1aeb33a 100644 --- a/css/style.css +++ b/css/style.css @@ -5,12 +5,15 @@ #app-navigation { min-width: 20em; - height: 100%; box-sizing: border-box; padding-bottom: 44px; border-left: 1px solid #ddd; border-right: 1px solid #ddd; resize: horizontal; + position: relative; + flex: 1; + top: 0; + height: 100vh; } /* Navigation: folder like structure */ #app-mailbox-peers { @@ -61,9 +64,9 @@ } #app-conversation { - height: 100%; + height: 100vh; overflow-y: auto; - flex: 4; + flex: 5; flex-direction: column; } diff --git a/js/devel/conversation.js b/js/devel/conversation.js index 7e0c9ac..b68e31b 100644 --- a/js/devel/conversation.js +++ b/js/devel/conversation.js @@ -138,7 +138,6 @@ var Conversation = new Vue({ */ addConversationMessage: function (msg) { this.messages.push(msg); - console.log(this.messages); }, removeConversationMessage: function (msgId) { const len = this.messages.length; diff --git a/templates/main.php b/templates/main.php index c1ad0e8..fbbb467 100644 --- a/templates/main.php +++ b/templates/main.php @@ -7,11 +7,11 @@ use \OCA\OcSms\Lib\CountryCodes; //\OCP\Util::addScript('ocsms', 'app.min'); // Develop \OCP\Util::addScript('ocsms', 'devel/app'); +\OCP\Util::addScript('ocsms', 'devel/settings'); \OCP\Util::addScript('ocsms', 'devel/contactlist'); \OCP\Util::addScript('ocsms', 'devel/conversation'); \OCP\Util::addScript('ocsms', 'devel/helpers'); \OCP\Util::addScript('ocsms', 'devel/notifications'); -\OCP\Util::addScript('ocsms', 'devel/settings'); \OCP\Util::addStyle('ocsms', 'style'); ?>