Skip to content

fix: fluent UI theme colors applied #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Prajwal-Microsoft merged 2 commits into from
Apr 22, 2025
Merged

fix: fluent UI theme colors applied #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d49102
UI - Theme colors applied
Bangarraju-Microsoft Apr 22, 2025
d0465b2
Merge branch 'psl-raju-dev' of https://github.com/microsoft/content-p…
Bangarraju-Microsoft Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/ContentProcessorWeb/src/Components/DocumentViewer/DocumentViewer.styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
.imageContainer{
width: 100%;
height: 100%;
border: 1px solid rgb(219, 219, 219)
border: 1px solid var(--colorNeutralBackground2Pressed)
}

.imageErrorContainer{
background: rgba(0, 0, 0, 0.3);
background: var(--colorBrandShadowAmbient);
/* margin: auto; */
display: flex;
align-items: center;
Expand All @@ -22,19 +22,19 @@
box-sizing: content-box;
margin: 30px;
border-radius: 6px;
border: 1px solid #c0c0c0;
border: 1px solid var(--colorNeutralStroke1Pressed);
/* font-size: 21px; */
/* font-weight: 600; */
box-shadow: azure;
/* transform: translate(-50%, -50%); */
/* top: 50%; */
/* left: 50%; */
background: white;
background: var(--colorNeutralBackground1);
/* display: flex
; */
background-color: white;
background-color: var(--colorNeutralBackground1);
border: 1px solid #ddd;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
box-shadow: 0 4px 8px var(--colorNeutralShadowAmbientDarker);

.imgEH{
font-size: 24px;
Expand All @@ -47,8 +47,8 @@
display: flex;
justify-content: center;
height: 100%;
border: 1px solid rgb(219, 219, 219);
background: rgb(246, 246, 246);
border: 1px solid var(--colorNeutralBackground2Pressed);
background: var(--colorNeutralBackground4)
}


Expand Down
19 changes: 9 additions & 10 deletions ...ocessorWeb/src/Pages/DefaultPage/Components/ProcessQueueGrid/ProcessQueueGrid.styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
}

.roundedBtn {
border: 1px solid #BDBDBD;
border: 1px solid var(--colorNeutralForegroundDisabled);
border-radius: 20px;
text-align: center;
padding: 1px 10px;
Expand All @@ -61,11 +61,11 @@
text-transform: capitalize;

span {
color: #2C3C85
color: var(--colorPaletteCornflowerForeground2)
}

.ProcessedCls {
color: #00666D
color: var(--colorPaletteLightTealForeground2)
}

}
Expand All @@ -75,23 +75,23 @@
text-align: center;

.gClass {
color: #359B35;
color: var(--colorStatusSuccessForeground3);
}

.yClass {
color: #C19C00;
color: var(--colorPaletteGoldBorderActive);
}

.oClass {
color: #FF5F3DE5;
color: var(--colorStatusWarningBackground3);
}

.rClass {
color: #B10E1C;
color: var(--colorStatusDangerForeground1);
}

.textClass {
color: #0F6CBD
color: var(--colorNeutralForeground2BrandHover)
}
}

Expand All @@ -107,7 +107,6 @@

.columnCotainer {
font-size: 12px;
color: #323130;
width: 100%;
}

Expand All @@ -127,6 +126,6 @@
display: flex;
align-items: center;
justify-content: center;
color: #0F6CBD
color: var(--colorNeutralForeground2BrandHover)
}
}
4 changes: 2 additions & 2 deletions src/ContentProcessorWeb/src/Pages/DefaultPage/Components/ProcessSteps/ProcessSteps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useCallback, useEffect, useState, useRef } from "react";
import { Accordion, AccordionItem, AccordionHeader, AccordionPanel } from "@fluentui/react-components";
import { Accordion, AccordionItem, AccordionHeader, AccordionPanel, tokens } from "@fluentui/react-components";
import { useDispatch, useSelector, shallowEqual } from 'react-redux';
import { RootState, AppDispatch } from '../../../../store/index.ts';
import { JsonEditor } from "json-edit-react";
Expand Down Expand Up @@ -70,7 +70,7 @@ const ProcessSteps = () => {
{!status.includes(store.selectedItem.status) && store.processStepsData?.map((step, index) => (
<AccordionItem key={index} value={step.step_name}>
<AccordionHeader onClick={() => handleExpand(index)}> {loadingStates[index] && <Spinner size="tiny" style={{ position: 'absolute', left: '10px' }} label="" />}
<span style={{ fontWeight: 'bold', textTransform: 'capitalize' }}>{step.step_name}</span>
<span style={{ fontWeight: 'bold', textTransform: 'capitalize'}}>{step.step_name}</span>
<span style={{ color: 'green', marginLeft: 'auto', display: 'flex', alignItems: 'center' }}>
{renderProcessTimeInSeconds(step.processed_time)} <CheckmarkCircleFilled style={{ marginLeft: '4px' }} />
</span>
Expand Down
9 changes: 4 additions & 5 deletions src/ContentProcessorWeb/src/Pages/DefaultPage/PanelCenter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useCallback, useEffect, useState } from "react";
import "../../Styles/App.css";
import { makeStyles, SelectTabData, SelectTabEvent, Tab, TabList, TabValue, Textarea, Divider, Button } from "@fluentui/react-components";
import { Field } from "@fluentui/react-components";
import { Field,tokens } from "@fluentui/react-components";
import PanelToolbar from "../../Hooks/usePanelHooks.tsx";
import JSONEditor from "../../Components/JSONEditor/JSONEditor"
import { useDispatch, useSelector, shallowEqual } from 'react-redux';
Expand All @@ -14,7 +14,6 @@ import { setRefreshGrid } from "../../store/slices/leftPanelSlice.ts";

import { bundleIcon, ChevronDoubleLeft20Filled, ChevronDoubleLeft20Regular } from "@fluentui/react-icons";
const ChevronDoubleLeft = bundleIcon(ChevronDoubleLeft20Regular, ChevronDoubleLeft20Filled);

interface PanelCenterProps {
togglePanel: (panel: string) => void;
}
Expand All @@ -41,7 +40,7 @@ const useStyles = makeStyles({
panelCenterBottomSeciton: {
padding: '10px 16px',
boxSizing: 'border-box',
background: '#FAFAFA',
background: tokens.colorNeutralBackground2,
position: 'relative'
},
panelLabel: {
Expand All @@ -62,13 +61,13 @@ const useStyles = makeStyles({
height: 'calc(100vh - 200px)',
border: '1px solid #DBDBDB',
overflow: 'auto',
background: '#f6f6f6',
background: tokens.colorNeutralBackground3,
padding: '5px',
boxSizing: 'border-box'
},
fieldLabel: {
fontWeight: 'bold',
color: '#424242',
color: tokens.colorNeutralForeground2,
},
textAreaClass: {
minHeight: '90px',
Expand Down
28 changes: 13 additions & 15 deletions src/ContentProcessorWeb/src/Pages/DefaultPage/Panels.styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
/* Panel container styling */

.panelLeftLayout {
/* background-color: var(--colorNeutralBackground4); */
position: relative;
display: flex;
height: 100%;
box-sizing: border-box;
flex-direction: column;
overflow-y: auto;
background-color: white;
border: 1px solid #D6D6D6;
background-color: var(--colorNeutralBackground1);
border: 1px solid var(--colorNeutralBackground3Pressed);
border-width: 1px 1px 0px 0px;
flex: 37%;
min-width: 300px;
Expand All @@ -30,8 +29,8 @@
box-sizing: border-box;
flex-direction: column;
overflow-y: auto;
background-color: white;
border: 1px solid #D6D6D6;
background-color: var(--colorNeutralBackground1);
border: 1px solid var(--colorNeutralBackground3Pressed);
border-width: 1px 1px 0px 0px;
}

Expand Down Expand Up @@ -86,8 +85,8 @@

flex: 31%;
min-width: 280px;
background: white;
border: 2px solid #d6d6d6;
background: var(--colorNeutralBackground1);
border: 2px solid var(--colorNeutralBackground3Pressed);
border-width: 2px 2px 0 0;

.custom-test button {
Expand All @@ -102,7 +101,7 @@

.msgp {
margin: auto;
color: red;
color: var(--colorPaletteRedBackground3);
}
}

Expand All @@ -115,7 +114,7 @@
flex: none;
width: auto;
min-width: 20px;
border: 1px solid #d6d6d6;
border: 1px solid var(--colorNeutralBackground3Pressed);
border-width: 1px 1px 0 0;

.collapseButtonDiv {
Expand All @@ -129,21 +128,21 @@


.panelRight {
/* background-color: var(--colorNeutralBackground4); */
background-color: var(--colorNeutralBackground4);
position: relative;
display: flex;
height: 100%;
box-sizing: border-box;
flex-direction: column;
overflow-y: auto;
background-color: white;
border: 1px solid #D6D6D6;
background-color: var(--colorNeutralBackground1);
border: 1px solid var(--colorNeutralBackground3Pressed);
border-width: 1px 0px 0px 0px;

flex: 31%;
min-width: 280px;
background: white;
border: 1px solid #d6d6d6;
background: var(--colorNeutralBackground1);
border: 1px solid var(--colorNeutralBackground3Pressed);
border-width: 1px 1px 0 0;

.panelRightContent {
Expand Down Expand Up @@ -213,7 +212,6 @@
/* Automatically adjusts height */
width: fit-content;
/* Adjust width based on content */
background-color: #f0f0f0;
cursor: pointer;
min-width: 10px !important;

Expand Down
Loading