From 056e2cc5dad261ebc09c18b29cc6a9c5693e6afc Mon Sep 17 00:00:00 2001
From: Kevin Risden <krisden@apache.org>
Date: Fri, 24 Jan 2020 22:14:27 -0500
Subject: [PATCH] SOLR-14038: Admin UI display for "state.json" should be in a
 scollable region

Signed-off-by: Kevin Risden <krisden@apache.org>
---
 solr/CHANGES.txt                      |  2 +
 solr/webapp/web/css/angular/cloud.css | 58 +++++++++++++--------------
 solr/webapp/web/css/angular/files.css |  4 +-
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 421f4978044..27b5f25455d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -192,6 +192,8 @@ Bug Fixes
 
 * SOLR-13887: Use default idleTimeout instead of 0 for HTTP2 requests. (Houston Putman)
 
+* SOLR-14038: Admin UI display for "state.json" should be in a scollable region (Kevin Risden)
+
 Other Changes
 ---------------------
 
diff --git a/solr/webapp/web/css/angular/cloud.css b/solr/webapp/web/css/angular/cloud.css
index f0277aaed1e..16e6db9a3cc 100644
--- a/solr/webapp/web/css/angular/cloud.css
+++ b/solr/webapp/web/css/angular/cloud.css
@@ -158,10 +158,8 @@ limitations under the License.
 
 #content #cloud #file-content
 {
-  position: fixed;
-  width: 55%;
-  min-height: 100px;
-  right: 5%;
+  float: right;
+  width: 68%;
 }
 
 #content #cloud .show #file-content
@@ -568,7 +566,7 @@ limitations under the License.
   padding-left: 0;
 }
 
-#content #cloud .details-button 
+#content #cloud .details-button
 {
   background-image: url(../../img/ico/ui-check-box-uncheck.png);
   background-position: 0 50%;
@@ -593,27 +591,27 @@ limitations under the License.
 
 /* Disk usage details d3 chart bars style */
 .chart {
-    background: #eee;
-    padding: 1px;
+  background: #eee;
+  padding: 1px;
 }
 .chart div {
-    width:90%;
+  width:90%;
 }
 .chart div div {
-    display:inline-block;
+  display:inline-block;
 }
 .chart div div.rect {
-    transition: all 0.5s ease-out;
-    -moz-transition: all 0.5s ease-out;
-    -webkit-transition: all 0.5s ease-out;
-    width:0;
-    font: 10px sans-serif;
-    background-color: #4CAF50;
-    text-align: left;
-    padding: 3px;
-    margin: 2px;
-    color: #000000;
-    box-shadow: 1px 1px 1px #666;
+  transition: all 0.5s ease-out;
+  -moz-transition: all 0.5s ease-out;
+  -webkit-transition: all 0.5s ease-out;
+  width:0;
+  font: 10px sans-serif;
+  background-color: #4CAF50;
+  text-align: left;
+  padding: 3px;
+  margin: 2px;
+  color: #000000;
+  box-shadow: 1px 1px 1px #666;
 }
 
 #content #nodes-content .leader
@@ -647,18 +645,18 @@ limitations under the License.
 
 
 ::-webkit-scrollbar {
-    -webkit-appearance: none;
-    width: 7px;
-    height: 7px;
+  -webkit-appearance: none;
+  width: 7px;
+  height: 7px;
 }
 
 ::-webkit-scrollbar-thumb {
-    border-radius: 4px;
-    background-color: rgba(0,0,0,.5);
-    -webkit-box-shadow: 0 0 1px rgba(255,255,255,.5);
+  border-radius: 4px;
+  background-color: rgba(0,0,0,.5);
+  -webkit-box-shadow: 0 0 1px rgba(255,255,255,.5);
 }
 #content #cloud #zk-table td,
-#content #cloud #zk-table th 
+#content #cloud #zk-table th
 {
   border: 0px solid #ddd;
   border-bottom: 0.50px solid #eee;
@@ -666,7 +664,7 @@ limitations under the License.
   padding-left: 5px;
 }
 
-#content #cloud #zk-table th 
+#content #cloud #zk-table th
 {
   border-bottom: 1px solid #ddd;
   border-top: 1px solid #ddd;
@@ -684,7 +682,7 @@ limitations under the License.
   font-weight: bold;
 }
 
-#content #cloud #zk-table #detail-divider 
+#content #cloud #zk-table #detail-divider
 {
   background-color: #f8f8f8;
   height: 10px;
@@ -704,7 +702,7 @@ limitations under the License.
   margin-bottom: 10px;
 }
 
-.zookeeper-errors li::before 
+.zookeeper-errors li::before
 {
   content: "- ";
 }
diff --git a/solr/webapp/web/css/angular/files.css b/solr/webapp/web/css/angular/files.css
index 46b3e8c3012..7adb918d838 100644
--- a/solr/webapp/web/css/angular/files.css
+++ b/solr/webapp/web/css/angular/files.css
@@ -36,9 +36,7 @@ limitations under the License.
 #content #files #file-content
 {
   float: right;
-  position: relative;
   width: 78%;
-  min-height: 100px
 }
 
 #content #files .show #file-content
@@ -50,4 +48,6 @@ limitations under the License.
 {
   border: 1px solid transparent;
   padding: 2px;
+  overflow: auto;
+  max-height: 600px;
 }