From 5ddd1dfe7bfc1e2b059a17dce550cdace5851fcb Mon Sep 17 00:00:00 2001 From: Josh Romero Date: Mon, 31 Jul 2023 20:01:24 +0000 Subject: [PATCH 1/2] Feat (Discover): Update styles to be compatible with next theme 1. Change doc table source highlight to use standard color functions instead of transparency 2. Build KUI CSS for next themes in OUI, and conditionally load to ensure surrounding doc view styled correctly 3. Update histogram styles to follow design guidance and avoid theme-specific imports Signed-off-by: Josh Romero --- packages/osd-ui-framework/Gruntfile.js | 2 + packages/osd-ui-framework/dist/kui_dark.css | 1165 ++++---- packages/osd-ui-framework/dist/kui_light.css | 1131 ++++---- .../osd-ui-framework/dist/kui_next_dark.css | 2581 +++++++++++++++++ .../osd-ui-framework/dist/kui_next_light.css | 2547 ++++++++++++++++ .../osd-ui-framework/src/kui_next_dark.scss | 15 + .../osd-ui-framework/src/kui_next_light.scss | 15 + src/legacy/ui/ui_render/ui_render_mixin.js | 8 +- .../angular/directives/_histogram.scss | 7 + .../angular/directives/histogram.tsx | 9 +- .../angular/doc_table/_doc_table.scss | 2 +- 11 files changed, 6420 insertions(+), 1062 deletions(-) create mode 100644 packages/osd-ui-framework/dist/kui_next_dark.css create mode 100644 packages/osd-ui-framework/dist/kui_next_light.css create mode 100644 packages/osd-ui-framework/src/kui_next_dark.scss create mode 100644 packages/osd-ui-framework/src/kui_next_light.scss diff --git a/packages/osd-ui-framework/Gruntfile.js b/packages/osd-ui-framework/Gruntfile.js index 9ad26b578e08..e0565b103736 100644 --- a/packages/osd-ui-framework/Gruntfile.js +++ b/packages/osd-ui-framework/Gruntfile.js @@ -74,6 +74,8 @@ module.exports = function (grunt) { Promise.all([ uiFrameworkCompile('src/kui_light.scss', 'dist/kui_light.css'), uiFrameworkCompile('src/kui_dark.scss', 'dist/kui_dark.css'), + uiFrameworkCompile('src/kui_next_light.scss', 'dist/kui_next_light.css'), + uiFrameworkCompile('src/kui_next_dark.scss', 'dist/kui_next_dark.css'), ]).then(done); }); diff --git a/packages/osd-ui-framework/dist/kui_dark.css b/packages/osd-ui-framework/dist/kui_dark.css index aa16bcdb34d3..e6d6f76e4f9a 100644 --- a/packages/osd-ui-framework/dist/kui_dark.css +++ b/packages/osd-ui-framework/dist/kui_dark.css @@ -1,24 +1,519 @@ -/* 1 */ -/* 1 */ -/** - * 1. Extend beta badges to at least 40% of the container's width - * 2. Fix for IE to ensure badges are visible outside of a