Skip to content
Merged
Show file tree
Hide file tree
Changes from 92 commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
b29bdd8
feat: add support for theming
eshankvaish Jan 2, 2025
67cdc5e
fix: update hard coded colors
eshankvaish Jan 2, 2025
470b4cb
fix: replace images
eshankvaish Jan 3, 2025
059011b
fix: theme for external elements
eshankvaish Jan 3, 2025
24ea6ba
fix: shimmer color
eshankvaish Jan 3, 2025
b1344da
fix: hex for N000
eshankvaish Jan 3, 2025
37f892b
feat: add button to toggle theme
eshankvaish Jan 3, 2025
3505d8e
fix: bg colors
eshankvaish Jan 3, 2025
a19dbd5
fix: use variables instead of hex codes
eshankvaish Jan 3, 2025
2d80990
fix: use variables instead of hex codes
eshankvaish Jan 3, 2025
636758d
fix: replace hex codes with variables
eshankvaish Jan 3, 2025
49d2ba9
fix: app and app group selector styles
eshankvaish Jan 3, 2025
21744b3
fix: replace hex codes with variables
eshankvaish Jan 3, 2025
5fef949
fix: replace hex codes with variables
eshankvaish Jan 3, 2025
de3b4c3
fix: remove unused code
eshankvaish Jan 3, 2025
38986a7
feat: read the theme from local storage
eshankvaish Jan 3, 2025
b446690
feat: add theme provider and feature flag
eshankvaish Jan 3, 2025
8328269
fix: modal background
eshankvaish Jan 3, 2025
e6f63e7
fix: flag name
eshankvaish Jan 3, 2025
21544d0
refactor: replace N000 with N0
eshankvaish Jan 3, 2025
a0ba7bc
refactor: clean up color variables
eshankvaish Jan 3, 2025
9ac633a
fix: bg color
eshankvaish Jan 3, 2025
d89d78a
fix: global body text color
eshankvaish Jan 3, 2025
0ca08bb
fix: replace --white
eshankvaish Jan 6, 2025
f55e8d9
fix: replace hex codes
eshankvaish Jan 6, 2025
13bf88c
fix: theming for code editor
eshankvaish Jan 6, 2025
8ca161c
fix: replace hard coded colors
eshankvaish Jan 6, 2025
4d5eea3
refactor: clean up patternfly.scss
eshankvaish Jan 6, 2025
1fa2e23
refactor: remove unused scss
eshankvaish Jan 6, 2025
f0ea0af
refactor: remove unused scss
eshankvaish Jan 6, 2025
6d0c061
fix: incorrect variable names
eshankvaish Jan 6, 2025
3a95ff2
Merge branch 'develop' of github.com:devtron-labs/dashboard into feat…
eshankvaish Jan 6, 2025
6bc9eef
fix: improve the handling for setting the class attribute
eshankvaish Jan 6, 2025
f5e6187
fix: update hte trigger type bg
eshankvaish Jan 6, 2025
8d2d3a1
fix: btn link bg color
eshankvaish Jan 6, 2025
1075afc
fix: color for workflow node trigger type
eshankvaish Jan 6, 2025
65e602a
fix: stroke for ic arrow clockwise
eshankvaish Jan 6, 2025
0ef65cb
refactor: code clean up
eshankvaish Jan 6, 2025
373dcd3
fix: replace hex codes
eshankvaish Jan 7, 2025
172da09
fix: replace hex codes
eshankvaish Jan 7, 2025
e8cdf07
fix: replace hex codes and remove unused code
eshankvaish Jan 7, 2025
03ae21f
fix: replace hex codes and remove unused code
eshankvaish Jan 7, 2025
47a93f2
fix: use tokens for bg
eshankvaish Jan 7, 2025
e414fa8
feat: add util classes for bg
eshankvaish Jan 7, 2025
8825994
feat: replace bcn-0 with bg__primary
eshankvaish Jan 7, 2025
03eb40a
feat: replace bcn-50 with bg__secondary
eshankvaish Jan 7, 2025
c10ee74
feat: replace dc__window-bg with bg__tertiary
eshankvaish Jan 7, 2025
fdb56cd
fix: svg colors
eshankvaish Jan 7, 2025
63382c8
fix: update to use bg tokens
eshankvaish Jan 7, 2025
49533ac
fix: multi select styles for app clone selector
eshankvaish Jan 7, 2025
1c5da85
feat: update hex for window bg
eshankvaish Jan 7, 2025
bc17bcc
chore: remove todo
eshankvaish Jan 7, 2025
4e7641f
fix: color for b500 in dark mode
eshankvaish Jan 8, 2025
7a2b1f4
feat: replace bcn-50 with bg__secondary
eshankvaish Jan 8, 2025
f1c715c
feat: add black color
eshankvaish Jan 8, 2025
a8e4ff5
feat: replace the bg for secondary button
eshankvaish Jan 8, 2025
b308017
feat: use var
eshankvaish Jan 8, 2025
dd80e67
feat: update tooltip styling using token
eshankvaish Jan 8, 2025
dbc3776
feat: add theming in toast manager using tokens
eshankvaish Jan 8, 2025
c2cca55
fix: styling for select
eshankvaish Jan 8, 2025
e01e0d1
fix: styling for markdown and update variable names
eshankvaish Jan 8, 2025
90feba8
fix: bg and border colors
eshankvaish Jan 8, 2025
a471033
fix: terminal bg
eshankvaish Jan 8, 2025
0dd304a
fix: more tabs styling
eshankvaish Jan 8, 2025
891c80d
fix: text__white util class
eshankvaish Jan 8, 2025
7de8b38
fix: select styles
eshankvaish Jan 8, 2025
6fa2738
fix: styling issues
eshankvaish Jan 8, 2025
117f294
fix: login page styling issues
eshankvaish Jan 8, 2025
6e32918
fix: styling for folder icon
eshankvaish Jan 8, 2025
183338e
fix: background color
eshankvaish Jan 8, 2025
2ab4e9a
fix: select bg menu
eshankvaish Jan 8, 2025
b8e29f9
feat: replace dc__ff-monospace with mono
eshankvaish Jan 8, 2025
f6faa00
feat: replace buttons in login
eshankvaish Jan 8, 2025
b4a1c9c
fix: focus state for text area
eshankvaish Jan 8, 2025
609ec3f
fix: add styling override for login page
eshankvaish Jan 8, 2025
37378db
fix: icon styles
eshankvaish Jan 8, 2025
0783c0d
fix: styling for log analyzer
eshankvaish Jan 8, 2025
88cd125
fix: bg color classes
eshankvaish Jan 9, 2025
872f29c
fix: color for bottom strip
eshankvaish Jan 9, 2025
5f4349f
fix: styling issues for select
eshankvaish Jan 9, 2025
8913f4a
fix: border bottom for app details tab
eshankvaish Jan 9, 2025
c3f0fdc
fix: bg for cta secondary
eshankvaish Jan 9, 2025
4c36e55
fix: styling for more tabs dropdown
eshankvaish Jan 9, 2025
7b55274
fix: border and specificity issue
eshankvaish Jan 9, 2025
ce58c1c
refactor: replace plugin form content with creatable select
eshankvaish Jan 9, 2025
6818c3e
fix: styling for dt metrics
eshankvaish Jan 9, 2025
10f300b
fix: styling issues for events and pod manifest
eshankvaish Jan 9, 2025
63bd821
fix: tippy styling
eshankvaish Jan 9, 2025
584b806
fix: input color scheme
eshankvaish Jan 9, 2025
8c3f369
feat: add color schema for dark mode
eshankvaish Jan 9, 2025
55e19fc
fix: icon styling
eshankvaish Jan 9, 2025
83de880
refactor: replace select picker for throughput and latency
eshankvaish Jan 9, 2025
3c5b0ba
fix: formatting
eshankvaish Jan 9, 2025
25d851a
fix: border color and typo
eshankvaish Jan 9, 2025
1110db3
fix: remove unused code
eshankvaish Jan 9, 2025
cb4d0dc
fix: github icon fill
eshankvaish Jan 9, 2025
2a383e1
fix: menu position for throughput and latency select
eshankvaish Jan 9, 2025
af140fd
chore: revert using variable in logs terminal
eshankvaish Jan 9, 2025
05903ad
fix: remove the theme switcher
eshankvaish Jan 9, 2025
25ff266
fix: remove logout card styling
eshankvaish Jan 9, 2025
84b4786
fix: css specificity issue
eshankvaish Jan 10, 2025
7143761
fix: column selector menu alignment
eshankvaish Jan 10, 2025
b601ac5
fix: styling for element scroller
eshankvaish Jan 10, 2025
f9ee0c1
fix: hover colors
eshankvaish Jan 10, 2025
042e664
refactor: fix variable naming convention
eshankvaish Jan 10, 2025
b22d0ae
fix: bg color for sidebar
eshankvaish Jan 10, 2025
0552217
fix: color and styling issues
eshankvaish Jan 10, 2025
f5d82af
fix: styling for scope variables
eshankvaish Jan 10, 2025
6ef0737
fix: replace #d1d1d1
eshankvaish Jan 10, 2025
27ab1e1
fix: replace hex codes
eshankvaish Jan 10, 2025
e9acc5f
chore: bump common
eshankvaish Jan 10, 2025
e6aa706
fix: color scheme
eshankvaish Jan 10, 2025
89fd654
fix: ic devtron app
eshankvaish Jan 10, 2025
47f90a4
fix: util classes
eshankvaish Jan 10, 2025
fdccb56
feat: add support for theme in initial app loader
eshankvaish Jan 10, 2025
8f4220f
fix: rename utils.scss to themeUtils.scss
eshankvaish Jan 10, 2025
8b85b98
fix: body styling issue
eshankvaish Jan 10, 2025
d86b59d
chore: comment the code app loader dark mode
eshankvaish Jan 10, 2025
c5a6b84
fix: add border for app details card
eshankvaish Jan 11, 2025
94717c9
fix: notification select styling
eshankvaish Jan 11, 2025
5543c8f
Merge branch 'develop' of github.com:devtron-labs/dashboard into chor…
eshankvaish Jan 13, 2025
70b29e5
fix: replace removed classes
eshankvaish Jan 13, 2025
c3655fb
fix: styling fixes
eshankvaish Jan 13, 2025
5a0ab05
chore: bump common
eshankvaish Jan 13, 2025
b03bef5
Merge pull request #2354 from devtron-labs/chore/sync-theming-with-dev
eshankvaish Jan 13, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,4 @@ FEATURE_DEFAULT_MERGE_STRATEGY=
FEATURE_CLUSTER_MAP_ENABLE=true
FEATURE_DEFAULT_LANDING_RB_ENABLE=false
FEATURE_ACTION_AUDIOS_ENABLE=true
FEATURE_EXPERIMENTAL_THEMING_ENABLE=false
1 change: 1 addition & 0 deletions config.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,6 @@
| TRIGGER_API_TIMEOUT | 60000 | Default timeout for all API requests for Trigger calls (Deploy artifacts, charts) in DASHBOARD |
| FEATURE_HIDE_USER_DIRECT_PERMISSIONS_FOR_NON_SUPER_ADMINS | "true" | Would hide the user direct permissions for non-super admin users in User Permissions |
| FEATURE_ACTION_AUDIOS_ENABLE | true | Would enable audios in dashboard |
| FEATURE_EXPERIMENTAL_THEMING_ENABLE | true | Would enable theming in dashboard |

# DASHBOARD CONFIG SECRET
23 changes: 22 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ import {
ToastVariantType,
API_STATUS_CODES,
logExceptionToSentry,
Button,
ButtonVariantType,
ButtonStyleType,
ComponentSizeType,
useTheme,
} from '@devtron-labs/devtron-fe-common-lib'
import { ReactComponent as ICSparkles } from '@Icons/ic-sparkles.svg'
import { ReactComponent as ICArrowClockwise } from '@Icons/ic-arrow-clockwise.svg'
Expand All @@ -49,6 +54,8 @@ const Login = lazy(() => import('./components/login/Login'))
const GenericDirectApprovalModal = importComponentFromFELibrary('GenericDirectApprovalModal')

export default function App() {
const {currentTheme, handleThemeChange} = useTheme()

const onlineToastRef = useRef(null)
const updateToastRef = useRef(null)
const [errorPage, setErrorPage] = useState<boolean>(false)
Expand Down Expand Up @@ -321,7 +328,7 @@ export default function App() {
<Suspense fallback={null}>
{validating ? (
<div className="full-height-width">
<DevtronProgressing parentClasses="h-100 flex bcn-0" classes="icon-dim-80" />
<DevtronProgressing parentClasses="h-100 flex bg__primary" classes="icon-dim-80" />
</div>
) : (
<>
Expand Down Expand Up @@ -360,6 +367,20 @@ export default function App() {
</>
)}
</Suspense>
{window._env_.FEATURE_EXPERIMENTAL_THEMING_ENABLE && (
<div className="dc__position-abs dc__bottom-30-imp dc__right-20">
<Button
icon={<ICSparkles />}
variant={ButtonVariantType.borderLess}
style={ButtonStyleType.neutral}
size={ComponentSizeType.small}
ariaLabel="Toggle theme"
showAriaLabelInTippy={false}
onClick={handleThemeChange}
dataTestId="toggle-theme"
/>
</div>
)}
</div>
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const CompareConfigView = ({
displayName,
}: CompareConfigViewProps) => (
<div className={`flexbox-col ${className ?? ''}`}>
<div className="dc__grid-half bcn-0 dc__position-sticky dc__top-0 dc__zi-10">
<div className="dc__grid-half bg__primary dc__position-sticky dc__top-0 dc__zi-10">
<div className="dc__border-right px-12 py-6 flexbox dc__gap-8 dc__border-bottom dc__align-items-center">
<ICCheck className="scn-9 icon-dim-16 dc__no-shrink" />
<span className="cn-9 fs-12 fw-6 lh-20">Published</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const ConfigHeaderTab = ({
onClick={handleChange}
type="button"
disabled={isDisabled}
className={`dc__transparent flexbox dc__align-items-center dc__gap-6 py-8 px-12 ${buttonContainerClass} ${isDisabled && !hasError ? 'dc__disabled' : ''} ${isActive ? 'bcn-0 cn-9' : 'cn-7'} ${isNextTabActive ? 'dc__border-right' : ''} ${isPreviousTabActive ? 'dc__border-left' : ''} fs-12 fw-6 lh-20`}
className={`dc__transparent flexbox dc__align-items-center dc__gap-6 py-8 px-12 ${buttonContainerClass} ${isDisabled && !hasError ? 'dc__disabled' : ''} ${isActive ? 'bg__primary cn-9' : 'cn-7'} ${isNextTabActive ? 'dc__border-right' : ''} ${isPreviousTabActive ? 'dc__border-left' : ''} fs-12 fw-6 lh-20`}
role="tab"
>
{hasError ? (
Expand Down Expand Up @@ -76,7 +76,7 @@ const ConfigHeader = ({
const activeTabIndex = tabKeys.indexOf(configHeaderTab)

return (
<div className="flexbox w-100 dc__align-items-center bc-n50 dc__box-shadow-bottom-n2">
<div className="flexbox w-100 dc__align-items-center bg__secondary dc__box-shadow-bottom-n2">
{tabKeys.map((currentTab: ConfigHeaderTabType, index: number) => (
<InvalidYAMLTippyWrapper
key={currentTab}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ const ConfigToolbar = ({

return (
<div
className={`px-12 bcn-0 dc__border-bottom-n1 flexbox dc__align-items-center dc__content-space dc__gap-8 dc__no-shrink h-32 ${!showProtectedTabs ? 'py-4' : ''}`}
className={`px-12 bg__primary dc__border-bottom-n1 flexbox dc__align-items-center dc__content-space dc__gap-8 dc__no-shrink h-32 ${!showProtectedTabs ? 'py-4' : ''}`}
>
<div className="flexbox dc__content-space dc__align-items-center dc__gap-8 dc__align-self-stretch">
{getLHSActionNodes()}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ const ChartSelectorDropdown = ({
<>
{customCharts.length > 0 && (
<div
className="pt-12 pr-12 pb-8 pl-12 dc__position-sticky bcn-0 top-0 dc__top-radius-4"
className="pt-12 pr-12 pb-8 pl-12 dc__position-sticky bg__primary top-0 dc__top-radius-4"
onClick={stopPropagation}
>
<RadioGroup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1678,7 +1678,7 @@ const DeploymentTemplate = ({
}

return (
<div className="flexbox dc__gap-6 dc__align-items-center dc__border-top-n1 bc-n50 py-6 px-10">
<div className="flexbox dc__gap-6 dc__align-items-center dc__border-top-n1 bg__secondary py-6 px-10">
<ICInfoOutlineGrey className="flex icon-dim-16 dc__no-shrink scn-6" />
<div className="flexbox">
<span className="cn-8 fs-12 fw-4 lh-20 dc__truncate">
Expand Down Expand Up @@ -1827,7 +1827,7 @@ const DeploymentTemplate = ({
}

return (
<div className="dc__border br-4 m-8 flexbox-col dc__content-space flex-grow-1 dc__overflow-scroll bcn-0">
<div className="dc__border br-4 m-8 flexbox-col dc__content-space flex-grow-1 dc__overflow-scroll bg__primary">
{renderBody()}

{showDeleteOverrideDialog && (
Expand Down Expand Up @@ -1891,7 +1891,7 @@ const DeploymentTemplate = ({
return (
<>
<div
className={`h-100 dc__window-bg ${showDraftComments ? 'deployment-template__comments-view' : 'flexbox'}`}
className={`h-100 bg__tertiary ${showDraftComments ? 'deployment-template__comments-view' : 'flexbox'}`}
>
{renderDeploymentTemplate()}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const DeploymentTemplateCTA = ({
}

return (
<footer className="flexbox dc__content-space p-12 bcn-0 dc__border-top dc__align-items-center">
<footer className="flexbox dc__content-space p-12 bg__primary dc__border-top dc__align-items-center">
<div
className={`flexbox ${showApplicationMetrics ? 'dc__content-space' : 'dc__content-end'} dc__align-items-center flex-grow-1`}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const DeploymentTemplateForm = ({
if (showReadMe) {
return (
<CodeEditor.Header className="flex left p-0-imp dc__border-bottom-n1" hideDefaultSplitHeader>
<div className="flexbox px-16 py-6 dc__content-space fs-12 fw-6 cn-9 bcn-0">
<div className="flexbox px-16 py-6 dc__content-space fs-12 fw-6 cn-9 bg__primary">
<div className="flexbox w-100 dc__gap-8 dc__align-items-center">
<div className="flexbox dc__gap-8 dc__align-items-center">
{!readOnly && <ICPencil className="icon-dim-16 dc__no-shrink" />}
Expand All @@ -90,7 +90,7 @@ const DeploymentTemplateForm = ({
<div className={`dc__overflow-scroll flex-grow-1 ${showReadMe ? 'dc__grid-half' : 'flexbox-col'}`}>
{showReadMe && (
<div className="flexbox-col dc__border-right dc__overflow-scroll">
<div className="flexbox dc__gap-8 bcn-0 px-12 py-6 dc__border-bottom-n1 flex left py-6">
<div className="flexbox dc__gap-8 bg__primary px-12 py-6 dc__border-bottom-n1 flex left py-6">
<ICBookOpen className="icon-dim-16 dc__no-shrink scn-9" />
<span className="fs-12 fw-6 cn-9 lh-20">{`Readme ${selectedChart ? `(v${selectedChart.version})` : ''}`}</span>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const DeploymentTemplateOptionsHeader = ({
}

return (
<div className="flexbox dc__align-items-center dc__content-space bcn-0 dc__gap-8">
<div className="flexbox dc__align-items-center dc__content-space bg__primary dc__gap-8">
{isGuiSupported && (
<>
<InvalidYAMLTippyWrapper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
display: grid;
grid-template-columns: 255px 1fr;
height: calc(100vh - 77px);
background: white;
background: var(--bg-primary);
overflow: hidden;

&.app-compose-for-env-compare {
Expand All @@ -31,8 +31,8 @@

.app-compose__nav {
padding: 16px 12px;
border-right: solid 1px #d6dbdf;
background: white;
border-right: solid 1px var(--N200);
background: var(--bg-primary);
height: 100%;
display: grid;
grid-template-columns: 1fr;
Expand Down Expand Up @@ -76,18 +76,18 @@
}

.help-container {
background-color: #f3f0ff;
background-color: var(--V100);
padding: 8px 12px;
border-radius: 4px;
height: 100px;

.progress-container {
background-color: #ffffff;
background-color: var(--bg-primary);
margin: 5px 0 10px 0;
font-size: 12px;

.progress-tracker {
background-color: #1dad70;
background-color: var(--G500);
height: 4px;
width: 1%;
}
Expand All @@ -113,7 +113,7 @@

.app-compose__main {
overflow: auto;
background-color: var(--window-bg);
background-color: var(--bg-tertiary);
}

.app-compose__nav-item {
Expand Down Expand Up @@ -141,7 +141,7 @@

&:hover:not(.no-hover) {
text-decoration: none;
background: var(--N50);
background: var(--bg-secondary);
}

&.active {
Expand Down Expand Up @@ -172,7 +172,7 @@
grid-template-columns: 16px 1fr;
grid-column-gap: 8px;
align-content: initial;
color: #f32e2e;
color: var(--R500);
font-size: 12px;

svg {
Expand All @@ -189,8 +189,8 @@
width: calc(100% - 240px - 72px);
height: 64px;
padding: 12px 24px;
background-color: rgba(242, 244, 247, 0.8);
box-shadow: inset 0 1px 0 0 #d6dbdf;
background-color: var(--bg-tertiary);
box-shadow: inset 0 1px 0 0 var(--N200);
z-index: var(--index-next-section);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const APITokenList = ({ tokenList, renderSearchToken, reload }: APITokenListType
const noMatchingResults = () => <GenericFilterEmptyState />

return (
<div className="bcn-0">
<div className="bg__primary">
<div data-testid="api-token-page-header" className="flex dc__content-space pl-20 pr-20 pb-16">
<FeatureTitleWithInfo
title={HEADER_TEXT.API_TOKEN.title}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

.api-list-row {
&:hover {
background-color: var(--N50);
background-color: var(--bg-secondary);
.api__row-actions {
display: flex;

Expand Down Expand Up @@ -85,7 +85,7 @@
.search {
margin-right: 0;
margin-bottom: 0 !important;
background-color: white;
background-color: var(--bg-primary);

.search__input {
&.search-applied {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const Authorization = () => {
<Route
path={path}
render={() => (
<div className="authorization-container flexbox-col flex-grow-1 min-h-100 bcn-0 flex-align-center dc__content-center pt-16">
<div className="authorization-container flexbox-col flex-grow-1 min-h-100 bg__primary flex-align-center dc__content-center pt-16">
<UserAndGroupPermissions />
</div>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const PermissionGroupTable = ({

return (
<div className="flexbox-col flex-grow-1 show-shimmer-loading">
<div className="user-permission__header cn-7 fs-12 fw-6 lh-20 dc__uppercase pl-20 pr-20 dc__border-bottom dc__position-sticky dc__top-0 bcn-0 dc__zi-1">
<div className="user-permission__header cn-7 fs-12 fw-6 lh-20 dc__uppercase pl-20 pr-20 dc__border-bottom dc__position-sticky dc__top-0 bg__primary dc__zi-1">
{isLoading ? (
<span className="child child-shimmer-loading" />
) : (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ class SSOLogin extends Component<SSOLoginProps, SSOLoginState> {
render() {
if (this.state.view === ViewType.LOADING) {
return (
<div className="bcn-0 h-100">
<div className="bg__primary h-100">
<Progressing pageLoader />
</div>
)
Expand Down Expand Up @@ -838,7 +838,7 @@ class SSOLogin extends Component<SSOLoginProps, SSOLoginState> {
/>
{renderSSOBody()}
</div>
<div className="px-20 py-16 dc__border-top-n1 w-100 dc__position-fixed bcn-0 dc__bottom-0">
<div className="px-20 py-16 dc__border-top-n1 w-100 dc__position-fixed bg__primary dc__bottom-0">
<button
onClick={this.onLoginConfigSave}
tabIndex={5}
Expand All @@ -853,7 +853,7 @@ class SSOLogin extends Component<SSOLoginProps, SSOLoginState> {
</div>
)
return (
<section className="bcn-0 sso-login__wrapper">
<section className="bg__primary sso-login__wrapper">
{renderSSOContent()}
{/* Confirmation Modal for SSO Change */}
{showSSOChangeConfirmationModal && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
border: none;
padding: 0 35px;
overflow: hidden;
color: #f32e2e;
color: var(--R500);
font-size: 14px;
font-family: Consolas, "Courier New", monospace;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const SSOTabIcons = ({ provider }: SSOTabIconsTypes) => {
case SSOProvider.google:
return <Google />
case SSOProvider.github:
return <GitHub />
return <GitHub className="fcn-8" />
case SSOProvider.gitlab:
return <GitLab />
case SSOProvider.microsoft:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ const K8sListItemCard = ({
}

return (
<div className="mt-16 mb-16 flexbox-col dc__gap-12 dc__border br-4 p-16 bcn-0">
<div className="mt-16 mb-16 flexbox-col dc__gap-12 dc__border br-4 p-16 bg__primary">
<div className="cn-7 fs-13 fw-4 lh-20 flex dc__content-space">
<span>Cluster</span>
{!selectedPermissionAction && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ const K8sPermissionModal = ({
return (
<Drawer onEscape={close} position="right" width="800px">
<div onClick={stopPropagation} className="h-100 h-100 flexbox-col flex-grow-1 dc__content-space">
<div className="flex pt-12 pb-12 pl-20 pr-20 dc__content-space bcn-0 dc__border-bottom">
<div className="flex pt-12 pb-12 pl-20 pr-20 dc__content-space bg__primary dc__border-bottom">
<span className="flex left fw-6 lh-24 fs-16">Kubernetes resource permission</span>
<span
className="icon-dim-20 cursor icon-use-fill-n6 flex"
Expand All @@ -159,7 +159,7 @@ const K8sPermissionModal = ({
<Close />
</span>
</div>
<div className="p-20 fs-13 dc__overflow-scroll flexbox-col flex-grow-1 dc__window-bg">
<div className="p-20 fs-13 dc__overflow-scroll flexbox-col flex-grow-1 bg__tertiary">
{!selectedPermissionAction && (
<div className="flex left fs-13 fw-6">
<span className="flex cb-5 cursor dc__gap-12" onClick={addNewPermissionCard}>
Expand Down Expand Up @@ -187,7 +187,7 @@ const K8sPermissionModal = ({
/>
))}
</div>
<div className="w-100 pt-16 pb-16 pl-20 pr-20 flex right dc__gap-16 bcn-0 dc__border-top">
<div className="w-100 pt-16 pb-16 pl-20 pr-20 flex right dc__gap-16 bg__primary dc__border-top">
<Button
text="Cancel"
onClick={close}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const UserPermissionTable = ({
<div
className={`user-permission__header ${
showStatus ? 'user-permission__header--with-status' : ''
} cn-7 fs-12 fw-6 lh-20 dc__uppercase pl-20 pr-20 dc__border-bottom dc__position-sticky dc__top-0 bcn-0 dc__zi-1`}
} cn-7 fs-12 fw-6 lh-20 dc__uppercase pl-20 pr-20 dc__border-bottom dc__position-sticky dc__top-0 bg__primary dc__zi-1`}
>
{isLoading ? (
<span className="child child-shimmer-loading" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const authorizationSelectStyles = {
option: (base, state) => ({
..._selectStyles.option(base, state),
...(state.isSelected && {
backgroundColor: state.isFocused ? 'var(--N100)' : 'white',
backgroundColor: state.isFocused ? 'var(--N100)' : 'var(--bg-primary)',
}),
}),
}
Expand Down
Loading
Loading