Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing top margin causing unnecessary above the .log-header on the monitoring page. #1238

Merged
merged 1 commit into from
Feb 24, 2017
Merged

Removing top margin causing unnecessary above the .log-header on the monitoring page. #1238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/styles/_log.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
}
.log-header {
margin-bottom: 3px;
margin-top: @grid-gutter-width / 2;
label {
margin-bottom: 0;
}
Expand Down Expand Up @@ -50,6 +49,14 @@
}
}
}
.log-viewer-select {
.log-header {
margin-bottom: 8px;
}
.log-actions {
margin-top: 5px;
}
}
.log-size-warning {
margin: 0;
}
Expand Down
3 changes: 2 additions & 1 deletion app/views/monitoring.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10874,7 +10874,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" +
Expand Down
4 changes: 3 additions & 1 deletion dist/styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5244,7 +5244,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}
Expand All @@ -5256,6 +5256,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}
}
Expand Down