Merge pull request #59 from bdpiparva/status-report

Removed additional margin from status report pages.
gocd · Sep 4, 2018 · 4ad2f92 · 4ad2f92
2 parents 63ef561 + 01a350a
commit 4ad2f92
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 1.0.2 - 2018-09-04
+- Removed additional margin from status report pages
+
 ## 1.0.1 - 2018-04-19
 
 * [9f879b8](https://github.com/gocd/kubernetes-elastic-agents/commit/9f879b8) - Handle IndexOutOfBounds when container hasn't been brough up within a pod.

diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@
 apply plugin: 'java'
 apply from: 'plugin-common.gradle'
 
-project.ext.pluginVersion = '1.0.1'
+project.ext.pluginVersion = '1.0.2'
 project.ext.fullVersion = project.distVersion ? "${project.pluginVersion}-${project.distVersion}" : project.pluginVersion
 
 group = 'cd.go.contrib'

diff --git a/src/main/resources/agent-status-report.template.ftlh b/src/main/resources/agent-status-report.template.ftlh
@@ -1,6 +1,11 @@
 <style>
+	.main-container {
+		margin-top: 0;
+	}
+
+
 	[data-plugin-style-id="kubernetes-plugin"] .kubernetes-elastic-agent {
-		padding: 60px 20px 0 20px;
+		padding: 70px 20px 0 20px;
 	}
 
 	[data-plugin-style-id="kubernetes-plugin"] .sub-nav {

diff --git a/src/main/resources/status-report.template.ftlh b/src/main/resources/status-report.template.ftlh
@@ -1,4 +1,33 @@
 <style>
+	.main-container {
+		margin-top: 0;
+	}
+
+	#status_reports {
+		margin-top: 50px;
+	}
+
+	[data-plugin-style-id="kubernetes-plugin"] .status-report-page-header {
+		top:             40px;
+		width:           100%;
+		height:          50px;
+		display:         flex;
+		z-index:         10;
+		position:        fixed;
+		background:      #fff;
+		box-shadow:      0 0 0 #000;
+		border-bottom:   1px solid #ddd;
+		background-size: cover;
+	}
+
+	[data-plugin-style-id="kubernetes-plugin"] .page_title {
+		font-size:   17px;
+		font-weight: 600;
+		margin:      0;
+		padding:     0 30px;
+		align-self:  center;
+	}
+
 	[data-plugin-style-id="kubernetes-plugin"] .cluster {
 		padding: 20px;
 	}
@@ -170,6 +199,9 @@
 </style>
 
 <div data-plugin-style-id="kubernetes-plugin">
+	<div class="status-report-page-header">
+		<h1 class="page_title">Kubernetes Plugin Status Report</h1>
+	</div>
 	<div class="cluster">
     <#if nodes?size != 0>
         <#list nodes as node>