From 89a0d1090d7369568fd1d9f69d2e8aca05344348 Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Tue, 15 Jan 2019 15:43:17 +0100
Subject: [PATCH 1/2] Move ColorPicker leftovers to @grafana/ui

---
 .../grafana-ui/src/components/ColorPicker/SpectrumPicker.tsx    | 2 +-
 .../grafana-ui/src/components/ColorPicker/_ColorPicker.scss     | 0
 packages/grafana-ui/src/components/index.scss                   | 2 ++
 packages/grafana-ui/src/index.scss                              | 2 ++
 .../vendor/css => packages/grafana-ui/src/vendor}/spectrum.css  | 0
 {public => packages/grafana-ui/src}/vendor/spectrum.js          | 0
 public/sass/_grafana.scss                                       | 2 --
 7 files changed, 5 insertions(+), 3 deletions(-)
 rename public/sass/components/_color_picker.scss => packages/grafana-ui/src/components/ColorPicker/_ColorPicker.scss (100%)
 rename {public/vendor/css => packages/grafana-ui/src/vendor}/spectrum.css (100%)
 rename {public => packages/grafana-ui/src}/vendor/spectrum.js (100%)

diff --git a/packages/grafana-ui/src/components/ColorPicker/SpectrumPicker.tsx b/packages/grafana-ui/src/components/ColorPicker/SpectrumPicker.tsx
index 6974eed142e..a225db09046 100644
--- a/packages/grafana-ui/src/components/ColorPicker/SpectrumPicker.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/SpectrumPicker.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import _ from 'lodash';
 import $ from 'jquery';
-import 'vendor/spectrum';
+import '../../vendor/spectrum';
 
 export interface Props {
   color: string;
diff --git a/public/sass/components/_color_picker.scss b/packages/grafana-ui/src/components/ColorPicker/_ColorPicker.scss
similarity index 100%
rename from public/sass/components/_color_picker.scss
rename to packages/grafana-ui/src/components/ColorPicker/_ColorPicker.scss
diff --git a/packages/grafana-ui/src/components/index.scss b/packages/grafana-ui/src/components/index.scss
index 5a9263844a4..31c8857a130 100644
--- a/packages/grafana-ui/src/components/index.scss
+++ b/packages/grafana-ui/src/components/index.scss
@@ -5,3 +5,5 @@
 @import 'Select/Select';
 @import 'PanelOptionsGroup/PanelOptionsGroup';
 @import 'PanelOptionsGrid/PanelOptionsGrid';
+@import 'PanelOptionsGrid/PanelOptionsGrid';
+@import 'ColorPicker/ColorPicker';
diff --git a/packages/grafana-ui/src/index.scss b/packages/grafana-ui/src/index.scss
index 841415620d6..74fdcde3072 100644
--- a/packages/grafana-ui/src/index.scss
+++ b/packages/grafana-ui/src/index.scss
@@ -1 +1,3 @@
+@import 'vendor/spectrum';
 @import 'components/index';
+
diff --git a/public/vendor/css/spectrum.css b/packages/grafana-ui/src/vendor/spectrum.css
similarity index 100%
rename from public/vendor/css/spectrum.css
rename to packages/grafana-ui/src/vendor/spectrum.css
diff --git a/public/vendor/spectrum.js b/packages/grafana-ui/src/vendor/spectrum.js
similarity index 100%
rename from public/vendor/spectrum.js
rename to packages/grafana-ui/src/vendor/spectrum.js
diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss
index b8498f18b19..93fd26b7ca8 100644
--- a/public/sass/_grafana.scss
+++ b/public/sass/_grafana.scss
@@ -3,7 +3,6 @@
 
 // VENDOR
 @import '../vendor/css/timepicker.css';
-@import '../vendor/css/spectrum.css';
 @import '../vendor/css/rc-cascader.scss';
 
 // MIXINS
@@ -76,7 +75,6 @@
 @import 'components/typeahead';
 @import 'components/modals';
 @import 'components/dropdown';
-@import 'components/color_picker';
 @import 'components/footer';
 @import 'components/infobox';
 @import 'components/shortcuts';

From 8cfa2c00d1f8ba4695a2db85d60d02d413206558 Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Tue, 15 Jan 2019 17:35:24 +0100
Subject: [PATCH 2/2] Remove duplicated import

---
 packages/grafana-ui/src/components/index.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/grafana-ui/src/components/index.scss b/packages/grafana-ui/src/components/index.scss
index 31c8857a130..b894cf73c1a 100644
--- a/packages/grafana-ui/src/components/index.scss
+++ b/packages/grafana-ui/src/components/index.scss
@@ -5,5 +5,4 @@
 @import 'Select/Select';
 @import 'PanelOptionsGroup/PanelOptionsGroup';
 @import 'PanelOptionsGrid/PanelOptionsGrid';
-@import 'PanelOptionsGrid/PanelOptionsGrid';
 @import 'ColorPicker/ColorPicker';