From 2d71617f0777c46f64783681d1cc4448a2865742 Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Wed, 24 Jan 2018 12:41:35 -0600 Subject: [PATCH] Style fixes --- app/assets/javascripts/app/controllers/editor.js | 3 +++ app/assets/javascripts/app/services/desktopManager.js | 1 - app/assets/stylesheets/app/_footer.scss | 4 ++++ app/assets/stylesheets/app/_lock-screen.scss | 1 + app/assets/templates/footer.html.haml | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/controllers/editor.js b/app/assets/javascripts/app/controllers/editor.js index 514342e83..d3f9c9db1 100644 --- a/app/assets/javascripts/app/controllers/editor.js +++ b/app/assets/javascripts/app/controllers/editor.js @@ -407,6 +407,9 @@ angular.module('app') this.noteReady = false; $timeout(() => { this.noteReady = true; + $timeout(() => { + this.reloadFont(); + }) }, 0) } } diff --git a/app/assets/javascripts/app/services/desktopManager.js b/app/assets/javascripts/app/services/desktopManager.js index 3454d6e19..24a1bf152 100644 --- a/app/assets/javascripts/app/services/desktopManager.js +++ b/app/assets/javascripts/app/services/desktopManager.js @@ -41,7 +41,6 @@ class DesktopManager { if(!this.isDesktop) return; var data = components.map((component) => { - console.log("Web Sycying Component", this.convertComponentForTransmission(component)); return this.convertComponentForTransmission(component); }) this.installationSyncHandler(data); diff --git a/app/assets/stylesheets/app/_footer.scss b/app/assets/stylesheets/app/_footer.scss index 5eb9851d0..950331dea 100644 --- a/app/assets/stylesheets/app/_footer.scss +++ b/app/assets/stylesheets/app/_footer.scss @@ -37,6 +37,10 @@ a.disabled { pointer-events: none; } +#lock-item { + margin-left: 3px; +} + .icon.ion-locked { margin-left: 5px; border-left: 1px solid gray; diff --git a/app/assets/stylesheets/app/_lock-screen.scss b/app/assets/stylesheets/app/_lock-screen.scss index 7fffb7097..5b0fe4ba9 100644 --- a/app/assets/stylesheets/app/_lock-screen.scss +++ b/app/assets/stylesheets/app/_lock-screen.scss @@ -25,6 +25,7 @@ .panel { width: 315px; + flex-grow: 0; .header { justify-content: center; diff --git a/app/assets/templates/footer.html.haml b/app/assets/templates/footer.html.haml index 68510d557..d06f0a86e 100644 --- a/app/assets/templates/footer.html.haml +++ b/app/assets/templates/footer.html.haml @@ -36,6 +36,6 @@ .item{"ng-if" => "!ctrl.offline", "ng-click" => "ctrl.refreshData()"} .label Refresh - .item{"ng-if" => "ctrl.hasPasscode()"} + .item#lock-item{"ng-if" => "ctrl.hasPasscode()"} .label %i.icon.ion-locked{"ng-if" => "ctrl.hasPasscode()", "ng-click" => "ctrl.lockApp()"}