[POC-4] style fixes

apfadler · Jul 2, 2016 · 8d10672 · 8d10672
1 parent 1e34e58
commit 8d10672
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/webapp/src/main/webapp/partials/dashboard.html b/webapp/src/main/webapp/partials/dashboard.html
@@ -136,7 +136,7 @@ <h3 class="page-header">Cluster Status</h3>
 	</div>
 
 	<div class="col-lg-6">
-		<div class="panel panel-default">
+		<div class="panel panel-default" >
 			<div class="panel-heading">
 					Cluster Log
 			</div>
@@ -149,7 +149,7 @@ <h3 class="page-header">Cluster Status</h3>
 					  firstLineNumber: 1,
 					  onLoad: aceLoaded,
 					  onChange: aceChanged
-					}" ng-model="logTxt">
+					}" ng-model="logTxt" style="height:45vh">
 				</div>
 			</div>
 		</div>

diff --git a/webapp/src/main/webapp/partials/task_management.html b/webapp/src/main/webapp/partials/task_management.html
@@ -12,12 +12,12 @@ <h1 class="page-header">Task Management</h1>
 
 		<uib-tabset active="active">
 			<uib-tab heading="Running Tasks">
-				<div class="panel panel-default" style="border-top: none" style="height:70vh;overflow-y:scroll">
+				<div class="panel panel-default" style="border-top: none;height:70vh;overflow-y:scroll">
 					<!--<div class="panel-heading">
                         Running Tasks
                     </div> -->
 					<!-- /.panel-heading -->
-					<div class="panel-body" style="height:75vh">
+					<div class="panel-body">
 						<h3>Submit new Task</h3><hr>
 						<div class="row">
 							<div class="col-lg-4">
@@ -76,21 +76,21 @@ <h3>Running Tasks</h3><hr>
 			</uib-tab>
 			<uib-tab heading="Task History">
 
-				<div class="panel panel-default" style="border-top: none">
+				<div class="panel panel-default" style="border-top: none;height:70vh;overflow-y:scroll">
 					<!--	<div class="panel-heading">
                             Task History
                         </div> -->
 					<!-- /.panel-heading -->
-					<div class="panel-body" style="height:75vh">
+					<div class="panel-body">
 
 						<h3>Recently completed Tasks</h3><hr>
 
-						<div ng-show="!finishedTasks.length" style="height:10vh">
+						<div ng-show="!finishedTasks.length">
 							<p>
 								No tasks have finished yet.
 							</p>
 						</div>
-						<div class="dataTable_wrapper" ng-show="finishedTasks.length > 0" style="height:75vh">
+						<div class="dataTable_wrapper" ng-show="finishedTasks.length > 0">
 							<table datatable="ng" class="table table-striped table-bordered table-hover"
 								   style = "width:90%"
 								   id="dataTables-example" >