IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14894 from grafana/grafana-ui/move-spectrum

Browse Source 
Move ColorPicker leftovers to @grafana/ui
This commit is contained in:
Dominik Prokop 2019-01-15 17:57:24 +01:00 committed by GitHub
commit b7451bc774
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grafana-ui/src/components/ColorPicker/SpectrumPicker.tsx
View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import _ from 'lodash'; import _ from 'lodash';
import $ from 'jquery'; import $ from 'jquery';
import 'vendor/spectrum'; import '../../vendor/spectrum';
export interface Props { export interface Props {
color: string; color: string;

0
public/sass/components/_color_picker.scss → packages/grafana-ui/src/components/ColorPicker/_ColorPicker.scss
View File

1
packages/grafana-ui/src/components/index.scss
View File

@ -5,3 +5,4 @@
@import 'Select/Select'; @import 'Select/Select';
@import 'PanelOptionsGroup/PanelOptionsGroup'; @import 'PanelOptionsGroup/PanelOptionsGroup';
@import 'PanelOptionsGrid/PanelOptionsGrid'; @import 'PanelOptionsGrid/PanelOptionsGrid';
@import 'ColorPicker/ColorPicker';

2
packages/grafana-ui/src/index.scss
View File

@ -1 +1,3 @@
@import 'vendor/spectrum';
@import 'components/index'; @import 'components/index';

0
public/vendor/css/spectrum.css → packages/grafana-ui/src/vendor/spectrum.css vendored
View File

0
public/vendor/spectrum.js → packages/grafana-ui/src/vendor/spectrum.js vendored
View File

2
public/sass/_grafana.scss
View File

@ -3,7 +3,6 @@
// VENDOR // VENDOR
@import '../vendor/css/timepicker.css'; @import '../vendor/css/timepicker.css';
@import '../vendor/css/spectrum.css';
@import '../vendor/css/rc-cascader.scss'; @import '../vendor/css/rc-cascader.scss';
// MIXINS // MIXINS
@ -76,7 +75,6 @@
@import 'components/typeahead'; @import 'components/typeahead';
@import 'components/modals'; @import 'components/modals';
@import 'components/dropdown'; @import 'components/dropdown';
@import 'components/color_picker';
@import 'components/footer'; @import 'components/footer';
@import 'components/infobox'; @import 'components/infobox';
@import 'components/shortcuts'; @import 'components/shortcuts';