From 733fcff58b1d8df4eb6db6260f0be72d2bf349cd Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Mon, 23 May 2016 11:35:19 -0700 Subject: [PATCH] new user on boarding: start document dialog in wrong position when no spaces or documents --- app/app/components/dropdown-dialog.js | 8 +++++--- app/app/styles/view/layout.scss | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/app/components/dropdown-dialog.js b/app/app/components/dropdown-dialog.js index 09c6e1f9..c63c9b1f 100644 --- a/app/app/components/dropdown-dialog.js +++ b/app/app/components/dropdown-dialog.js @@ -1,11 +1,11 @@ // Copyright 2016 Documize Inc. . All rights reserved. // -// This software (Documize Community Edition) is licensed under +// This software (Documize Community Edition) is licensed under // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html // // You can operate outside the AGPL restrictions by purchasing // Documize Enterprise Edition and obtaining a commercial license -// by contacting . +// by contacting . // // https://documize.com @@ -30,6 +30,8 @@ export default Ember.Component.extend({ onAction2: null, offset: "5px 0", targetOffset: "10px 0", + constrainToWindow: true, + constrainToScrollParent: true, hasSecondButton: Ember.computed('button2', 'color2', function() { return is.not.empty(this.get('button2')) && is.not.empty(this.get('color2')); @@ -106,4 +108,4 @@ export default Ember.Component.extend({ } } } -}); \ No newline at end of file +}); diff --git a/app/app/styles/view/layout.scss b/app/app/styles/view/layout.scss index d077322e..741ac8cd 100644 --- a/app/app/styles/view/layout.scss +++ b/app/app/styles/view/layout.scss @@ -1,5 +1,6 @@ .page-container { padding-top: 60px; + min-height: 500px; //ensure dropdowns render in viewport } .copyright {