Skip to content

Commit 5263b92

Browse files
committed
Removing top margin causing unnecessary above the .log-header on the monitoring page.
Adding class to adjust spacing when ui-select is shown Fixes #1233
1 parent e56ff68 commit 5263b92

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

app/styles/_log.less

+14-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22
margin-top: 0;
33
}
44
.log-header {
5+
// Position log-status and log-actions at left and right sides and center align text vertically
6+
// align-items: center;
57
margin-bottom: 3px;
6-
margin-top: @grid-gutter-width / 2;
8+
// .align-items(@align: center);
9+
// .flex-display(@display: flex);
10+
// .flex-wrap(@wrap: wrap);
11+
// .justify-content(@justify: space-between);
712
label {
813
margin-bottom: 0;
914
}
@@ -50,6 +55,14 @@
5055
}
5156
}
5257
}
58+
.log-viewer-select {
59+
.log-header {
60+
margin-bottom: 8px;
61+
}
62+
.log-actions {
63+
margin-top: 5px;
64+
}
65+
}
5366
.log-size-warning {
5467
margin: 0;
5568
}

app/views/monitoring.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ <h2>Pods</h2>
116116
empty="logEmpty.pods[pod.metadata.name]"
117117
run="logCanRun.pods[pod.metadata.name]"
118118
fixed-height="250"
119-
full-log-url="(pod | navigateResourceURL) + '?view=chromeless'">
119+
full-log-url="(pod | navigateResourceURL) + '?view=chromeless'"
120+
ng-class="{'log-viewer-select': pod.spec.containers.length > 1}">
120121

121122
<span class="container-details">
122123
<label for="selectLogContainer">Container:</label>

dist/scripts/templates.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10862,7 +10862,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1086210862
"</div>\n" +
1086310863
"</div>\n" +
1086410864
"<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" +
10865-
"<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" +
10865+
"<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" +
1086610866
"<span class=\"container-details\">\n" +
1086710867
"<label for=\"selectLogContainer\">Container:</label>\n" +
1086810868
"<span ng-if=\"pod.spec.containers.length === 1\">\n" +

dist/styles/main.css

+3-1
Original file line numberDiff line numberDiff line change
@@ -5133,7 +5133,7 @@ a.subtle-link:active,a.subtle-link:focus,a.subtle-link:hover{color:#00659c;borde
51335133
.log-header .log-actions .btn-link,.log-view{padding:0}
51345134
.mar-left-xxl{margin-left:30px}
51355135
.log-title{margin-top:0}
5136-
.log-header{margin-bottom:3px;margin-top:20px}
5136+
.log-header{margin-bottom:3px}
51375137
.log-header label{margin-bottom:0}
51385138
.log-header .dash{color:#9c9c9c;margin:0 2px}
51395139
.log-header .ui-select-container{min-width:150px;max-width:250px;margin:0 5px}
@@ -5145,6 +5145,8 @@ a.subtle-link:active,a.subtle-link:focus,a.subtle-link:hover{color:#00659c;borde
51455145
.log-header .log-timestamps{font-size:84%;display:inline-block}
51465146
.log-header .log-actions{float:right!important;float:right;margin-left:5px}
51475147
}
5148+
.log-viewer-select .log-header{margin-bottom:8px}
5149+
.log-viewer-select .log-actions{margin-top:5px}
51485150
.log-size-warning{margin:0}
51495151
@media (max-width:991px){.log-size-warning{margin-top:20px}
51505152
}

0 commit comments

Comments
 (0)