Skip to content

Commit f77cc24

Browse files
committed
Merge branch 'feat/template-create' of github.com:devtron-labs/devtron-fe-common-lib into feat/template-detail
2 parents 369f0ca + f6b01f0 commit f77cc24

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

src/Common/Constants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ export const URLS = {
8686
GLOBAL_CONFIG: '/global-config',
8787
GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP,
8888
GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP_CREATE: `${GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP}/create`,
89+
// NOTE: using appId since we are re-using AppConfig component
8990
GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP_DETAIL: `${GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP}/detail/:appId`,
9091
}
9192

src/Shared/Components/GenericInfoCard/styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
&:hover {
1515
position: relative;
1616
z-index: 1;
17-
box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.10);
17+
box-shadow: var(--shadow-card-secondary);
1818

1919
// NOTE: &__title was not working here
2020
.generic-info-card__title {

src/Shared/Components/GenericInfoCard/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export enum GenericInfoCardBorderVariant {
2525
export type GenericInfoCardProps = { borderVariant: GenericInfoCardBorderVariant } & (
2626
| ({
2727
isLoading: true
28-
} & Partial<BaseGenericInfoCardProps>)
28+
} & Partial<Record<keyof BaseGenericInfoCardProps, never>>)
2929
| ({
3030
isLoading?: boolean
3131
} & BaseGenericInfoCardProps)

0 commit comments

Comments
 (0)