Skip to content

Commit 35b6d92

Browse files
committed
Merge branch 'develop' of github.com:devtron-labs/devtron-fe-common-lib into feature/create-cluster
2 parents 6fe547f + 023d109 commit 35b6d92

File tree

28 files changed

+373
-113
lines changed

28 files changed

+373
-113
lines changed

package-lock.json

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.11.0-pre-4",
3+
"version": "1.12.0-pre-0",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",
@@ -121,6 +121,7 @@
121121
"jsonpath-plus": "^10.3.0",
122122
"marked": "^13.0.3",
123123
"nanoid": "^3.3.8",
124+
"qrcode.react": "^4.2.0",
124125
"react-canvas-confetti": "^2.0.7",
125126
"react-dates": "^21.8.0",
126127
"react-diff-viewer-continued": "^3.4.0",

src/Assets/Icon/ic-cpu.svg

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/Assets/Icon/ic-memory.svg

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/Assets/IconV2/ic-cpu.svg

Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading

src/Assets/IconV2/ic-memory.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Common/Constants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ export const ROUTES = {
156156
RESOURCE_TEMPLATE: 'resource/template',
157157
ENVIRONMENT_DATA: 'global/environment-variables',
158158
DASHBOARD_EVENT: 'dashboard-event',
159+
LICENSE_DATA: 'license/data',
159160
} as const
160161

161162
export enum KEY_VALUE {

src/Common/EmptyState/emptyState.scss

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,6 @@
1616

1717
.empty-state {
1818
height: 100%;
19-
img {
20-
height: 40%;
21-
max-height: 200px;
22-
width: auto;
23-
max-width: 250px;
24-
}
25-
svg {
26-
height: 40%;
27-
max-height: 200px;
28-
width: auto;
29-
}
30-
.button svg {
31-
height: 100%;
32-
max-height: none;
33-
width: 100%;
34-
}
3519
h1,
3620
h2,
3721
h3,

src/Pages/GlobalConfigurations/BuildInfra/constants.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { ReactComponent as ICCpu } from '@Icons/ic-cpu.svg'
18-
import { ReactComponent as ICMemory } from '@Icons/ic-memory.svg'
1917
import { ReactComponent as ICSprayCan } from '@Icons/ic-spray-can.svg'
2018
import { ReactComponent as ICTag } from '@Icons/ic-tag.svg'
2119
import { ReactComponent as ICTimer } from '@Icons/ic-timer.svg'
20+
import { ReactComponent as ICCpu } from '@IconsV2/ic-cpu.svg'
21+
import { ReactComponent as ICMemory } from '@IconsV2/ic-memory.svg'
2222
import { UseBreadcrumbProps } from '@Common/BreadCrumb/Types'
2323
import { CMSecretComponentType } from '@Shared/Services'
2424

0 commit comments

Comments
 (0)