From 82f9d01b20d2cb1e68328e1fd71f98fa05f54998 Mon Sep 17 00:00:00 2001 From: Cee Chen Date: Mon, 10 Jul 2023 12:40:39 -0700 Subject: [PATCH 1/4] Order EUI Emotion styles before Sass styles - We're at the point now where almost all low-level EUI atoms are in Emotion, and any remaining EUI Sass are larger molecules that should override EUI atoms --- .../core-rendering-server-internal/src/views/template.tsx | 2 +- packages/kbn-storybook/templates/index.ejs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/core/rendering/core-rendering-server-internal/src/views/template.tsx b/packages/core/rendering/core-rendering-server-internal/src/views/template.tsx index bbc8109e403d..bac48c88e1b2 100644 --- a/packages/core/rendering/core-rendering-server-internal/src/views/template.tsx +++ b/packages/core/rendering/core-rendering-server-internal/src/views/template.tsx @@ -54,8 +54,8 @@ export const Template: FunctionComponent = ({ {/* Inject EUI reset and global styles before all other component styles */} - + {/* Inject stylesheets into the before scripts so that KP plugins with bundled styles will override them */} diff --git a/packages/kbn-storybook/templates/index.ejs b/packages/kbn-storybook/templates/index.ejs index e8d8d4d6df09..b52fc548b814 100644 --- a/packages/kbn-storybook/templates/index.ejs +++ b/packages/kbn-storybook/templates/index.ejs @@ -15,6 +15,7 @@ +