Formatting fixes to History page

NASA-AMMOS · Nov 3, 2024 · c49bc1b · c49bc1b
1 parent dfa1f0f
commit c49bc1b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/cws-ui/src/main/webapp/css/history.css b/cws-ui/src/main/webapp/css/history.css
@@ -43,7 +43,7 @@ summary {
     align-items: flex-end;
     gap: 10px;
     margin-bottom: 5px;
-    margin-left: 30px;
+    margin-left: 22px;
 }
 
 .above-table-buttons {

diff --git a/install/cws-ui/history.ftl b/install/cws-ui/history.ftl
@@ -1189,7 +1189,7 @@ function convertMillis(millis) {
 <body>
 	<#include "navbar.ftl">
 
-	<div class="container-fluid" style="margin-left: 20px; margin-top: 25px;">
+	<div class="container-fluid" style="max-width: 100%; margin: 25px auto; padding: 0 20px;">
 
 		<h2 class="sub-header">History</h2>
 		<div class="row">
@@ -1243,9 +1243,11 @@ function convertMillis(millis) {
 				</tbody>
 			</table>
 		</div>
-      <div id="resolveButtonDiv" class="row" style="text-align: center; display: none;">
-        <button id="resolveButton" class="btn btn-primary" type="button" onclick="markAsResolved($('#procInstId').text())">Mark as Resolved</button>
-		<button id="retryIncidentButton" class="btn btn-primary" type="button" onclick="retryIncident($('#procInstId').text())">Retry Incident</button>
+      <div id="resolveButtonDiv" class="row" style="text-align: center; display: none; gap: 10px;">
+        <div style="display: inline-flex; gap: 10px;">
+          <button id="resolveButton" class="btn btn-primary btn-sm" type="button" onclick="markAsResolved($('#procInstId').text())">Mark as Resolved</button>
+          <button id="retryIncidentButton" class="btn btn-primary btm-sm" type="button" onclick="retryIncident($('#procInstId').text())">Retry Incident</button>
+        </div>
       </div>
 		</div>
 
@@ -1255,7 +1257,7 @@ function convertMillis(millis) {
 		<div class="row">
 			<div class="col main">
 				<div id="log-div" style="width: 100%;">
-					<table id="logData" class="table table-striped table-bordered sortable" style="margin-top: 25px;">
+					<table id="logData" class="table table-striped table-bordered sortable" style="margin: 25px 20px; width: 98%;">
 						<thead>
 							<tr>
 								<th id="timeStampColumn" class="col-1" scope="col">Time Stamp</th>