浏览代码

wip: testing new styles

Torkel Ödegaard 7 年之前
父节点
当前提交
fe0f66b3f2
共有 2 个文件被更改,包括 9 次插入67 次删除
  1. 2 5
      public/app/features/dashboard/dashgrid/QueriesTab.tsx
  2. 7 62
      public/sass/components/_panel_editor.scss

+ 2 - 5
public/app/features/dashboard/dashgrid/QueriesTab.tsx

@@ -331,12 +331,9 @@ export class QueriesTab extends PureComponent<Props, State> {
     };
 
     return (
-      <EditorTabBody
-        heading="Queries"
-        renderToolbar={this.renderToolbar}
-        toolbarItems={[options, queryInspector, dsHelp]}
-      >
+      <EditorTabBody heading="Data" renderToolbar={this.renderToolbar} toolbarItems={[options, queryInspector, dsHelp]}>
         <div className="panel-option-section">
+          <div className="panel-option-section__header">Queries</div>
           <div className="panel-option-section__body">
             <div className="query-editor-rows gf-form-group">
               <div ref={element => (this.element = element)} />

+ 7 - 62
public/sass/components/_panel_editor.scss

@@ -32,7 +32,7 @@
   display: flex;
   flex-direction: column;
   flex-grow: 1;
-  background: $page-bg;
+  background: $input-bg;
   margin: 0 20px 0 84px;
   border-radius: 3px;
   box-shadow: $panel-editor-shadow;
@@ -63,12 +63,7 @@
 }
 
 .panel-editor__content {
-  padding: 0;
-}
-
-.panel-editor__toolbar-view {
-  background: $panel-editor-toolbar-view-bg;
-  padding: 20px;
+  padding: 10px;
 }
 
 .panel-in-fullscreen {
@@ -142,8 +137,8 @@
 }
 
 .viz-picker__item {
-  background: $panel-bg;
-  border: $panel-border;
+  background: $panel-editor-viz-item-bg;
+  border: $panel-editor-viz-item-border;
   border-radius: 3px;
   height: 100px;
   width: 150px;
@@ -242,64 +237,13 @@
   }
 }
 
-.ds-picker-list {
-  display: flex;
-  flex-wrap: wrap;
-  margin-bottom: 13px;
-  flex-direction: column;
-}
-
-.ds-picker-list__item {
-  background: $panel-editor-viz-item-bg;
-  border: $panel-editor-viz-item-border;
-  border-radius: 3px;
-  display: flex;
-  cursor: pointer;
-  margin-bottom: 3px;
-  padding: 5px 15px;
-  align-items: center;
-  height: 44px;
-
-  &--selected {
-    background: $panel-editor-viz-item-bg-hover;
-    border: $panel-editor-viz-item-border-hover;
-    box-shadow: $panel-editor-viz-item-shadow-hover;
-  }
-
-  &--active {
-    box-shadow: 0 0 6px $orange;
-    border: 1px solid $orange;
-
-    .ds-picker-list__name {
-      color: $text-color;
-    }
-  }
-}
-
 .ds-picker {
   position: relative;
   min-width: 200px;
 }
 
-.ds-picker-menu {
-  min-width: 400px;
-  max-width: 500px;
-  position: absolute;
-  background: $panel-editor-toolbar-view-bg;
-  padding: 5px;
-  overflow: auto;
-}
-
-.ds-picker-list__name {
-  text-overflow: ellipsis;
-  overflow: hidden;
-  white-space: nowrap;
-  font-size: $font-size-md;
-  padding-left: 15px;
-}
-
-.ds-picker-list__img {
-  width: 30px;
+.panel-option-section {
+  margin-bottom: 10px;
 }
 
 .panel-option-section__header {
@@ -317,4 +261,5 @@
 
 .panel-option-section__body {
   padding: 20px;
+  background: $page-bg;
 }