Merge pull request #1238 from sg00dwin/log-header-space-issue1233

Merged by openshift-bot

Author: OpenShift Bot

app/styles/_log.less

@@ -3,7 +3,6 @@
 }
 .log-header {
   margin-bottom: 3px;
-  margin-top: @grid-gutter-width / 2;
   label {
     margin-bottom: 0;
   }
@@ -50,6 +49,14 @@
     }
   }
 }
+.log-viewer-select {
+  .log-header {
+    margin-bottom: 8px;
+  }
+  .log-actions {
+    margin-top: 5px;
+  }
+}
 .log-size-warning {
   margin: 0;
 }

app/views/monitoring.html

@@ -116,7 +116,8 @@ <h2>Pods</h2>
                         empty="logEmpty.pods[pod.metadata.name]"
                         run="logCanRun.pods[pod.metadata.name]"
                         fixed-height="250"
-                        full-log-url="(pod | navigateResourceURL) + '?view=chromeless'">
+                        full-log-url="(pod | navigateResourceURL) + '?view=chromeless'"
+                        ng-class="{'log-viewer-select': pod.spec.containers.length > 1}">
 
                         <span class="container-details">
                           <label for="selectLogContainer">Container:</label>

dist/scripts/templates.js

@@ -10878,7 +10878,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "</div>\n" +
     "<div ng-repeat-end ng-if=\"expanded.pods[pod.metadata.name]\" class=\"list-group-expanded-section\" ng-class=\"{'expanded': expanded.pods[pod.metadata.name]}\">\n" +
-    "<log-viewer ng-if=\"'pods/log' | canI : 'get'\" object=\"pod\" context=\"projectContext\" options=\"logOptions.pods[pod.metadata.name]\" empty=\"logEmpty.pods[pod.metadata.name]\" run=\"logCanRun.pods[pod.metadata.name]\" fixed-height=\"250\" full-log-url=\"(pod | navigateResourceURL) + '?view=chromeless'\">\n" +
+    "<log-viewer ng-if=\"'pods/log' | canI : 'get'\" object=\"pod\" context=\"projectContext\" options=\"logOptions.pods[pod.metadata.name]\" empty=\"logEmpty.pods[pod.metadata.name]\" run=\"logCanRun.pods[pod.metadata.name]\" fixed-height=\"250\" full-log-url=\"(pod | navigateResourceURL) + '?view=chromeless'\" ng-class=\"{'log-viewer-select': pod.spec.containers.length > 1}\">\n" +
     "<span class=\"container-details\">\n" +
     "<label for=\"selectLogContainer\">Container:</label>\n" +
     "<span ng-if=\"pod.spec.containers.length === 1\">\n" +

dist/styles/main.css

@@ -5251,7 +5251,7 @@ a.subtle-link:active,a.subtle-link:focus,a.subtle-link:hover{color:#00659c;borde
 .log-header .log-actions .btn-link,.log-view{padding:0}
 .mar-left-xxl{margin-left:30px}
 .log-title{margin-top:0}
-.log-header{margin-bottom:3px;margin-top:20px}
+.log-header{margin-bottom:3px}
 .log-header label{margin-bottom:0}
 .log-header .dash{color:#9c9c9c;margin:0 2px}
 .log-header .ui-select-container{min-width:150px;max-width:250px;margin:0 5px}
@@ -5263,6 +5263,8 @@ a.subtle-link:active,a.subtle-link:focus,a.subtle-link:hover{color:#00659c;borde
 .log-header .log-timestamps{font-size:84%;display:inline-block}
 .log-header .log-actions{float:right!important;float:right;margin-left:5px}
 }
+.log-viewer-select .log-header{margin-bottom:8px}
+.log-viewer-select .log-actions{margin-top:5px}
 .log-size-warning{margin:0}
 @media (max-width:991px){.log-size-warning{margin-top:20px}
 }