Skip to content

Commit 85852ba

Browse files
authored
Merge pull request #2684 from devtron-labs/feature/install-devtron
chore: update scss, remove checkbox assets, sync main
2 parents 42ffe3a + fe5879a commit 85852ba

29 files changed

+104
-374
lines changed

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,4 @@ FEATURE_CODE_MIRROR_ENABLE=true
6565
FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false
6666
GATEKEEPER_URL=https://license.devtron.ai/dashboard
6767
FEATURE_AI_INTEGRATION_ENABLE=false
68+
LOGIN_PAGE_IMAGE=

config.md

Lines changed: 50 additions & 49 deletions
Large diffs are not rendered by default.

nginx-default.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
server {
22
listen 8080;
3+
listen [::]:8080;
34
root /usr/share/nginx/html;
45
index index.html index.htm;
56

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "1.12.0-pre-8",
7+
"@devtron-labs/devtron-fe-common-lib": "1.13.0-pre-0",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

src/Pages/GlobalConfigurations/Authorization/APITokens/CreateAPIToken.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ const CreateAPIToken = ({
246246

247247
return (
248248
<div className="w-100 flexbox-col flex-grow-1 dc__content-space pb-16">
249-
<div className="pl-20 pr-20 pb-20">
250-
<div className="flex dc__content-space pb-16 dc__gap-8">
249+
<div className="px-20 pb-20">
250+
<div className="flex dc__content-space py-16 dc__gap-8">
251251
<div className="flex row ml-0 h-32">
252252
<div className="cn-9 fw-6 fs-16">
253253
<span className="cb-5 cursor" onClick={redirectToTokenList}>

src/Pages/GlobalConfigurations/Authorization/APITokens/EditAPIToken.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ const EditAPIToken = ({
208208

209209
return (
210210
<div className="fs-13 fw-4 w-100 flexbox-col flex-grow-1 dc__content-space pb-16">
211-
<div className="pl-20 pr-20 pb-20">
212-
<div className="flex dc__content-space pb-16 dc__gap-8">
211+
<div className="px-20 pb-20">
212+
<div className="flex dc__content-space py-16 dc__gap-8">
213213
<div className="flex row ml-0">
214214
<div className="cn-9 fw-6 fs-16">
215215
<span className="cb-5 cursor" onClick={redirectToTokenList}>

src/Pages/GlobalConfigurations/Authorization/PermissionGroups/AddEdit/PermissionGroupForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ const PermissionGroupForm = ({ isAddMode }: { isAddMode: boolean }) => {
156156

157157
return (
158158
<div className="flexbox-col dc__align-start dc__align-self-stretch flex-grow-1 dc__gap-24 pb-16">
159-
<div className="flex dc__content-space dc__gap-8 pr-20 pl-20 w-100">
159+
<div className="flex dc__content-space dc__gap-8 px-20 pt-16 w-100">
160160
<div className="flex dc__content-start dc__gap-4 fs-16 lh-32 fw-4 dc__ellipsis-right">
161161
<Link className="anchor" to={URLS.GLOBAL_CONFIG_AUTH_PERMISSION_GROUPS}>
162162
Permission Groups

src/Pages/GlobalConfigurations/Authorization/UserPermissions/AddEdit/UserForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ const UserForm = ({ isAddMode }: { isAddMode: boolean }) => {
268268

269269
return (
270270
<div className="flexbox-col dc__align-start dc__align-self-stretch flex-grow-1 dc__gap-24 pb-16">
271-
<div className="flex pr-20 pl-20 dc__content-space dc__gap-8 w-100">
271+
<div className="flex px-20 pt-16 dc__content-space dc__gap-8 w-100">
272272
<div className="flex dc__content-start dc__gap-4 fs-16 lh-32 fw-4 dc__ellipsis-right">
273273
<Link className="anchor" to={URLS.GLOBAL_CONFIG_AUTH_USER_PERMISSION}>
274274
User Permissions

src/assets/icons/dark/ic-bulk-check.svg

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

src/assets/icons/dark/ic-checkbox-hover.svg

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

0 commit comments

Comments
 (0)