Post rebase changes.

WordPress · Apr 25, 2018 · 1e8ea5a · 1e8ea5a
1 parent 1595a3f
commit 1e8ea5a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/blocks/colors/with-colors.js b/blocks/colors/with-colors.js
@@ -13,7 +13,6 @@ import { createHigherOrderComponent } from '@wordpress/element';
  */
 import { getColorValue, getColorClass, setColorValue } from './utils';
 import { withEditorSettings } from '../editor-settings';
-import './style.scss';
 
 /**
  * Higher-order component, which handles color logic for class generation

diff --git a/core-blocks/index.js b/core-blocks/index.js
@@ -11,6 +11,7 @@ import { deprecated } from '@wordpress/utils';
 /**
  * Internal dependencies
  */
+import './style.scss';
 import * as paragraph from './paragraph';
 import * as image from './image';
 import * as heading from './heading';

diff --git a/blocks/colors/style.scss → core-blocks/style.scss b/blocks/colors/style.scss → core-blocks/style.scss