From 2f4566b63ca8feb137ceb417f2ac5b7bf0fb9139 Mon Sep 17 00:00:00 2001
From: milad <milad@miladnazeri.com>
Date: Thu, 25 Jul 2019 12:17:38 -0700
Subject: [PATCH] merged master and fixed height

---
 interface/resources/qml/controlsUit/PermissionPopup.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/controlsUit/PermissionPopup.qml b/interface/resources/qml/controlsUit/PermissionPopup.qml
index 549d6f7d6d..9940232eb1 100644
--- a/interface/resources/qml/controlsUit/PermissionPopup.qml
+++ b/interface/resources/qml/controlsUit/PermissionPopup.qml
@@ -7,7 +7,7 @@ import stylesUit 1.0 as HifiStyles
 Rectangle {
     id: root
     width: 750
-    height: 225
+    height: 210
     color: hifi.colors.white
 
     anchors.centerIn: parent
@@ -61,7 +61,7 @@ Rectangle {
         
         Rectangle {
             id: permissionsButtonsRow
-            height: 115
+            height: 100
             Layout.preferredWidth: parent.width
             Layout.topMargin: 35
             property int space: 8