From 34c0b5d2a3cffda0f1f96cd834e9729bf323d968 Mon Sep 17 00:00:00 2001 From: burnettk Date: Mon, 7 Nov 2022 10:10:47 -0500 Subject: [PATCH] explicit themes --- spiffworkflow-frontend/src/App.tsx | 48 ++++++++++--------- .../src/components/NavigationBar.tsx | 1 - spiffworkflow-frontend/src/index.scss | 11 +++-- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/spiffworkflow-frontend/src/App.tsx b/spiffworkflow-frontend/src/App.tsx index 186ac513..2561c2a8 100644 --- a/spiffworkflow-frontend/src/App.tsx +++ b/spiffworkflow-frontend/src/App.tsx @@ -46,28 +46,30 @@ export default function App() { } return ( - - - - - {errorTag} - - - } /> - } /> - } /> - } - /> - } - /> - - - - - +
+ + + + + {errorTag} + + + } /> + } /> + } /> + } + /> + } + /> + + + + + +
); } diff --git a/spiffworkflow-frontend/src/components/NavigationBar.tsx b/spiffworkflow-frontend/src/components/NavigationBar.tsx index b3932515..7ecd7c47 100644 --- a/spiffworkflow-frontend/src/components/NavigationBar.tsx +++ b/spiffworkflow-frontend/src/components/NavigationBar.tsx @@ -124,7 +124,6 @@ export default function NavigationBar() { }; if (activeKey) { - // TODO: apply theme g100 to the header return ( ( diff --git a/spiffworkflow-frontend/src/index.scss b/spiffworkflow-frontend/src/index.scss index 7ef64a65..ee9ca2c2 100644 --- a/spiffworkflow-frontend/src/index.scss +++ b/spiffworkflow-frontend/src/index.scss @@ -5,6 +5,11 @@ // @include grid.flex-grid(); // @use '@carbon/react/scss/colors'; -// .cds--header, a.cds--header__menu-item { -// background-color: colors.$gray-100; -// } + +// site is mainly using white theme. +// header is mainly using g100 +// mockup wanted white, not grey, text +.cds--header, a.cds--header__menu-item { + // background-color: colors.$gray-100; + color: white; +}