From 12fa8ef65ac77b1069aea7fa56d30760f9311e39 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 23 Nov 2017 11:26:59 -0500
Subject: [PATCH] (css) Fix scrolling in Administration module

---
 .../UIxAdministrationAclEditor.wox            |  4 +--
 .../scss/views/AdministrationUI.scss          | 27 -------------------
 UI/WebServerResources/scss/views/_view.scss   |  2 +-
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox b/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox
index 4f41b8a99..760f8a803 100644
--- a/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox
+++ b/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox
@@ -6,7 +6,7 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label"
     >
-  <div layout-fill="layout-fill">
+  <div layout-fill="layout-fill" layout="column">
     <md-card>
       <md-toolbar class="hide show-xs" flex-none="flex-none">
         <div class="md-toolbar-tools">
@@ -42,7 +42,7 @@
           <md-icon>save</md-icon>
         </md-button>
       </md-toolbar>
-      <md-card-content class="md-flex md-static">
+      <md-card-content>
         <div layout="row">
           <md-icon>search</md-icon>
           <md-autocomplete
diff --git a/UI/WebServerResources/scss/views/AdministrationUI.scss b/UI/WebServerResources/scss/views/AdministrationUI.scss
index 2ea339a60..3503eb0e8 100644
--- a/UI/WebServerResources/scss/views/AdministrationUI.scss
+++ b/UI/WebServerResources/scss/views/AdministrationUI.scss
@@ -1,31 +1,4 @@
 /// AdministrationUI.scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*-
 
 [ui-view="administration"] {
-  [id="usersList"] > md-list {
-    // Since the users list doesn't use the virtual repeater, force the vertical scroll
-    position: absolute;
-    top: $touch-zone-width;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    overflow: hidden;
-    overflow-y: auto;
-
-    .sg-folder .md-button {
-      // Buttons in list-item to view the ACLs of a user's folder
-      @extend .sg-no-wrap;
-      flex: 1 1 auto;
-      text-align: left;
-      text-transform: none;
-    }
-  }
-
-  .view-detail {
-    @include from(md) {
-      .viewer {
-        // Leave space for a tall toolbar
-        top: $toolbar-tall-height;
-      }
-    }
-  }
 }
diff --git a/UI/WebServerResources/scss/views/_view.scss b/UI/WebServerResources/scss/views/_view.scss
index 4df3a03dc..86d2ef4ad 100644
--- a/UI/WebServerResources/scss/views/_view.scss
+++ b/UI/WebServerResources/scss/views/_view.scss
@@ -123,7 +123,7 @@ body {
   // On small screens, the view slides from the right and takes all screen place.
   // Expected Display Steps:
   //  1. The class sg-close is used when there's no selection
-  //  2. An list item is selected (ui-router state changes):
+  //  2. A list item is selected (ui-router state changes):
   //   a. sg-close is removed from view-detail
   //   b. view-detail (transparent) slides over view-list
   //   c. viewer is inserted into the DOM and slides inside view-detail