Torkel Ödegaard 7 лет назад
Родитель
Сommit
cb59f388ca
2 измененных файлов с 14 добавлено и 16 удалено
  1. 12 12
      public/app/features/explore/Logs.tsx
  2. 2 4
      public/sass/components/_panel_logs.scss

+ 12 - 12
public/app/features/explore/Logs.tsx

@@ -441,21 +441,21 @@ export default class Logs extends PureComponent<LogsProps, LogsState> {
                 </ToggleButton>
                 </ToggleButton>
               ))}
               ))}
             </ToggleButtonGroup>
             </ToggleButtonGroup>
-
-            {hasData &&
-              meta && (
-                <div className="logs-panel-meta">
-                  {meta.map(item => (
-                    <div className="logs-panel-meta__item" key={item.label}>
-                      <span className="logs-panel-meta__label">{item.label}:</span>
-                      <span className="logs-panel-meta__value">{renderMetaItem(item.value, item.kind)}</span>
-                    </div>
-                  ))}
-                </div>
-              )}
           </div>
           </div>
         </div>
         </div>
 
 
+        {hasData &&
+          meta && (
+            <div className="logs-panel-meta">
+              {meta.map(item => (
+                <div className="logs-panel-meta__item" key={item.label}>
+                  <span className="logs-panel-meta__label">{item.label}:</span>
+                  <span className="logs-panel-meta__value">{renderMetaItem(item.value, item.kind)}</span>
+                </div>
+              ))}
+            </div>
+          )}
+
         <div className="logs-rows">
         <div className="logs-rows">
           {hasData &&
           {hasData &&
             !deferLogs &&
             !deferLogs &&

+ 2 - 4
public/sass/components/_panel_logs.scss

@@ -6,7 +6,7 @@ $column-horizontal-spacing: 10px;
   padding: $panel-padding;
   padding: $panel-padding;
   padding-top: 10px;
   padding-top: 10px;
   border-radius: $border-radius;
   border-radius: $border-radius;
-  margin: 2*$panel-margin 0;
+  margin: 2*$panel-margin 0 $panel-margin;
   border: $panel-border;
   border: $panel-border;
   flex-direction: column;
   flex-direction: column;
 }
 }
@@ -31,8 +31,7 @@ $column-horizontal-spacing: 10px;
 .logs-panel-meta {
 .logs-panel-meta {
   flex: 1;
   flex: 1;
   color: $text-color-weak;
   color: $text-color-weak;
-  // Align first line with controls labels
-  margin-top: -2px;
+  margin-bottom: 10px;
   min-width: 30%;
   min-width: 30%;
   display: flex;
   display: flex;
 }
 }
@@ -40,7 +39,6 @@ $column-horizontal-spacing: 10px;
 .logs-panel-meta__item {
 .logs-panel-meta__item {
   margin-right: 1em;
   margin-right: 1em;
   display: flex;
   display: flex;
-  flex-direction: column;
 }
 }
 
 
 .logs-panel-meta__label {
 .logs-panel-meta__label {