Fix layout issues on logs view and cards too large

1. The lines on logs view had excessive spacing 2. All cards were 100% height
92nqb · Sep 19, 2016 · 4b8b213 · 4b8b213
1 parent 4b7a99e
commit 4b8b213
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/app/frontend/common/components/contentcard/contentcard.scss b/src/app/frontend/common/components/contentcard/contentcard.scss
@@ -21,7 +21,6 @@
 
 kd-content-card {
   display: block;
-  height: 100%;
   margin: 2.5 * $baseline-grid;
 }
 

diff --git a/src/app/frontend/logs/logs.html b/src/app/frontend/logs/logs.html
@@ -41,13 +41,13 @@
     <md-virtual-repeat-container class="kd-log-view" ng-class="ctrl.getStyleClass()"
                                  md-top-index="ctrl.topIndex">
       <div md-virtual-repeat="item in ctrl.logsSet" ng-class="ctrl.getLogsClass()">
-        <span ng-bind-html="item">&nbsp;</span>
+        <span ng-bind-html="item" class="kd-log-line">&nbsp;</span>
       </div>
     </md-virtual-repeat-container>
   </kd-content>
-  <kd-footer ng-show="ctrl.logsSet.length > 1">
+  <kd-footer>
     <div layout="row">
-      <span class="kd-logs-info">
+      <span class="kd-logs-info" ng-show="ctrl.logsSet.length > 1">
         {{ctrl.i18n.MSG_LOGS_TITLE_FROM}}
         {{ctrl.podLogs.firstLogLineReference.logTimestamp | date : "short"}}
         {{ctrl.i18n.MSG_LOGS_TITLE_TO}}

diff --git a/src/app/frontend/logs/logs.scss b/src/app/frontend/logs/logs.scss
@@ -52,10 +52,13 @@ $logs-color-white: #fff;
 .kd-log-view {
   flex: 1;
   font-family: $font-family-medium-monospace;
-  white-space: pre-wrap;
   width: 100%;
 }
 
+.kd-log-line {
+  white-space: pre-wrap;
+}
+
 // The style below is to make the logs view card full width & height.
 kd-content-card {
   &.kd-log-content-card {