Merge pull request #1908 from recena/JENKINS-31395

[JENKINS-31395] Footer does not work fine in some situations
jenkinsci · Dec 7, 2015 · fc30b32 · fc30b32
2 parents dd43540 + 9013b29
commit fc30b32
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
@@ -227,7 +227,7 @@ ${h.initPageVariables(context)}
       </div>
     </div>
 
-    <div id="page-body">
+    <div id="page-body" class="clear">
       <div id="side-panel">
         <j:set var="mode" value="side-panel" />
         <d:invokeBody />

diff --git a/war/src/main/webapp/css/style.css b/war/src/main/webapp/css/style.css
@@ -31,10 +31,7 @@ html {
 
 body {
   margin: 0;
-  padding: 0;
-  background: white;
-  margin-right: auto;
-  margin-left: auto;
+  padding: 0 0 40px 0;
 }
 
 #header {
@@ -74,14 +71,20 @@ body {
   background-color: #f6faf2;
 }
 
+#page-body.clear:after {
+  clear: both;
+  content: "";
+  display: table;
+}
+
 #side-panel {
-  padding: 15px 15px 80px 15px;
+  padding: 15px 15px 40px 15px;
   float: left;
   width: 320px;
 }
 
 #main-panel {
-  padding: 15px 15px 80px 15px;
+  padding: 15px 15px 40px 15px;
   margin-left: 320px;
 }
 
@@ -129,13 +132,15 @@ body {
 /* footer */
 
 footer {
-  padding: 10px 0;
+  padding: 11px 0;
   background-color: #f6faf2;
   border-top: 1px solid #d3d7cf;
+  border-bottom: 1px solid #f6faf2;
   width: 100%;
   position: absolute;
   bottom: 0;
   left: 0;
+  clear: both;
   font-size: 12px;
   text-align: right;
 }