Review feedback

- use color variables for cascader styles
- fix Table value type
pull/12821/head
David Kaltschmidt 7 years ago
parent 642374de25
commit 2961c3b3b9
  1. 9
      public/app/containers/Explore/Table.tsx
  2. 2
      public/sass/_grafana.scss
  3. 24
      public/vendor/css/rc-cascader.scss

@ -66,7 +66,14 @@ export default class Table extends PureComponent<TableProps, {}> {
{tableModel.rows.map((row, i) => (
<tr key={i}>
{row.map((value, j) => (
<Cell key={j} columnIndex={j} rowIndex={i} value={value} table={data} onClickCell={onClickCell} />
<Cell
key={j}
columnIndex={j}
rowIndex={i}
value={String(value)}
table={data}
onClickCell={onClickCell}
/>
))}
</tr>
))}

@ -1,7 +1,7 @@
// vendor
@import '../vendor/css/timepicker.css';
@import '../vendor/css/spectrum.css';
@import '../vendor/css/rc-cascader.css';
@import '../vendor/css/rc-cascader.scss';
// MIXINS
@import 'mixins/mixins';

@ -4,11 +4,11 @@
.rc-cascader-menus {
font-size: 12px;
overflow: hidden;
background: #fff;
background: $panel-bg;
position: absolute;
border: 1px solid #d9d9d9;
border-radius: 6px;
box-shadow: 0 0 4px rgba(0, 0, 0, 0.17);
border: $panel-border;
border-radius: $border-radius;
box-shadow: $typeahead-shadow;
white-space: nowrap;
}
.rc-cascader-menus-hidden {
@ -57,7 +57,7 @@
list-style: none;
margin: 0;
padding: 0;
border-right: 1px solid #e9e9e9;
border-right: $panel-border;
overflow: auto;
}
.rc-cascader-menu:last-child {
@ -75,11 +75,11 @@
position: relative;
}
.rc-cascader-menu-item:hover {
background: #eaf8fe;
background: $typeahead-selected-bg;
}
.rc-cascader-menu-item-disabled {
cursor: not-allowed;
color: #ccc;
color: $text-color-weak;
}
.rc-cascader-menu-item-disabled:hover {
background: transparent;
@ -88,14 +88,16 @@
position: absolute;
right: 12px;
content: 'loading';
color: #aaa;
color: $text-color-weak;
font-style: italic;
}
.rc-cascader-menu-item-active {
background: #d5f1fd;
color: $typeahead-selected-color;
background: $typeahead-selected-bg;
}
.rc-cascader-menu-item-active:hover {
background: #d5f1fd;
color: $typeahead-selected-color;
background: $typeahead-selected-bg;
}
.rc-cascader-menu-item-expand {
position: relative;
@ -103,7 +105,7 @@
.rc-cascader-menu-item-expand:after {
content: '>';
font-size: 12px;
color: #999;
color: $text-color-weak;
position: absolute;
right: 16px;
line-height: 32px;
Loading…
Cancel
Save