From 3b43cabc687f61c6c7fc2f5083b93b806a66d840 Mon Sep 17 00:00:00 2001
From: iRouge <bfavreault@inverse.ca>
Date: Sun, 25 Jan 2015 21:30:27 -0500
Subject: [PATCH] Revert [a5ba017bc3] (Regression fix)

---
 UI/Templates/ContactsUI/UIxContactFoldersView.wox | 6 ++++--
 UI/WebServerResources/css/styles.css              | 2 +-
 UI/WebServerResources/scss/views/_view.scss       | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 474e2a536..80ef994d6 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -62,7 +62,9 @@
     </ul>
     -->
 
-    <div data-ui-view="addressbooks" layout="row" class="view"><!-- addressbooks list --></div>
+  <div>
+
+    <div data-ui-view="addressbooks" layout="row" style="max-height: 100%"><!-- addressbooks list --></div>
 
     <!-- modal for addressbook sharing options -->
     <script type="text/ng-template" id="UIxUserRightsEditor">
@@ -247,5 +249,5 @@
     </script>
 
     <var:string value="errorAlertJavaScript" const:escapeHTML="NO" />
-
+  </div>
 </var:component>
diff --git a/UI/WebServerResources/css/styles.css b/UI/WebServerResources/css/styles.css
index aecaf7511..ac250797c 100644
--- a/UI/WebServerResources/css/styles.css
+++ b/UI/WebServerResources/css/styles.css
@@ -2215,7 +2215,7 @@ md-tab > .md-ripple-container .md-ripple {
   order: 9; }
 
 .view[layout=row] {
-  min-height: 100%; }
+  max-height: 100%; }
 
 /* Angular-material components local overrides */
 md-list {
diff --git a/UI/WebServerResources/scss/views/_view.scss b/UI/WebServerResources/scss/views/_view.scss
index bc1cdc1a6..556b8ae17 100644
--- a/UI/WebServerResources/scss/views/_view.scss
+++ b/UI/WebServerResources/scss/views/_view.scss
@@ -7,5 +7,5 @@
 ///
 
 .view[layout=row] {
-  min-height: 100%;
+  max-height: 100%;
 }
\ No newline at end of file