소스 검색

wip: minor style changes

Torkel Ödegaard 7 년 전
부모
커밋
f39fd7655e

+ 2 - 11
public/app/features/dashboard/dashgrid/VisualizationTab.tsx

@@ -5,7 +5,7 @@ import React, { PureComponent } from 'react';
 import { getAngularLoader, AngularComponent } from 'app/core/services/AngularLoader';
 
 // Components
-import { EditorTabBody, EditorToolBarView } from './EditorTabBody';
+import { EditorTabBody } from './EditorTabBody';
 import { VizTypePicker } from './VizTypePicker';
 import { FadeIn } from 'app/core/components/Animations/FadeIn';
 
@@ -197,18 +197,9 @@ export class VisualizationTab extends PureComponent<Props, State> {
   render() {
     const { plugin } = this.props;
     const { isVizPickerOpen, searchQuery } = this.state;
-    const toolbarItems: EditorToolBarView[] = [];
-
-    if (!isVizPickerOpen) {
-      toolbarItems.push({
-        title: '',
-        icon: 'fa fa-question',
-        render: () => <h2>Help</h2>,
-      });
-    }
 
     return (
-      <EditorTabBody heading="Visualization" renderToolbar={this.renderToolbar} toolbarItems={toolbarItems}>
+      <EditorTabBody heading="Visualization" renderToolbar={this.renderToolbar}>
         <>
           <FadeIn in={isVizPickerOpen} duration={200} unmountOnExit={true}>
             <VizTypePicker

+ 5 - 3
public/sass/components/_json_explorer.scss

@@ -21,10 +21,10 @@
         display: none;
       }
       &.json-formatter-object::after {
-        content: "No properties";
+        content: 'No properties';
       }
       &.json-formatter-array::after {
-        content: "[]";
+        content: '[]';
       }
     }
   }
@@ -33,7 +33,9 @@
     color: $json-explorer-string-color;
     white-space: normal;
     word-wrap: break-word;
+    word-break: break-all;
   }
+
   .json-formatter-number {
     color: $json-explorer-number-color;
   }
@@ -87,7 +89,7 @@
     &::after {
       display: inline-block;
       transition: transform $json-explorer-rotate-time ease-in;
-      content: "►";
+      content: '►';
     }
   }
 

+ 3 - 4
public/sass/components/_panel_editor.scss

@@ -132,8 +132,7 @@
 }
 
 .viz-picker {
-  background: $toolbar-bg;
-  margin: -40px -20px 40px -20px;
+  margin-top: -40px;
   padding: 20px;
   position: relative;
 }
@@ -144,8 +143,8 @@
 }
 
 .viz-picker__item {
-  background: $panel-editor-viz-item-bg;
-  border: $panel-editor-viz-item-border;
+  background: $panel-bg;
+  border: $panel-border;
   border-radius: 3px;
   height: 100px;
   width: 150px;