Skip to content
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.

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

fix(web): fix #718 app info edit bug #738

Merged
merged 1 commit into from
Feb 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions web/src/assets/login.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
padding: 6px 16px;
width: 100%;
height: 42px;
background: #00A99D;
background: #00a99d;
border-radius: 64px;
border-color: #00A99D;
border-color: #00a99d;
}

.login-panel .ant-btn-primary:focus,
Expand All @@ -34,13 +34,13 @@

.login-panel .ant-form-item-control-input-content,
.login-panel .ant-form-item-control-input-content a {
color: #00A99D;
color: #00a99d;
}

.login-panel .ant-input-lg {
font-size: 16px;
border: 0px;
border-bottom: 1px solid #9CA2A8;
border-bottom: 1px solid #9ca2a8;
border-radius: 0;
padding: 6.5px 11px;
}
Expand All @@ -50,8 +50,8 @@
background-image: none;
border: 0px;
border-radius: 0;
border-bottom: 1px solid #9CA2A8;
color: rgba(0, 0, 0, .85);
border-bottom: 1px solid #9ca2a8;
color: rgba(0, 0, 0, 0.85);
display: inline-block;
display: -ms-inline-flexbox;
display: inline-flex;
Expand All @@ -60,13 +60,13 @@
min-width: 0;
padding: 4px 11px;
position: relative;
transition: all .3s;
transition: all 0.3s;
width: 100%;
}

.login-panel .anticon svg {
display: inline-block;
color: #47C8BF;
color: #47c8bf;
}

.login-panel button {
Expand All @@ -78,7 +78,7 @@
border-color: #00a99d;
}

.login-panel .ant-checkbox-input:focus+.ant-checkbox-inner,
.login-panel .ant-checkbox-input:focus + .ant-checkbox-inner,
.login-panel .ant-checkbox-wrapper:hover .ant-checkbox-inner,
.login-panel .ant-checkbox:hover .ant-checkbox-inner {
border-color: #00a99d;
Expand Down Expand Up @@ -121,4 +121,4 @@
display: none;
}

/* </style> */
/* </style> */
2 changes: 1 addition & 1 deletion web/src/components/Editor/JsonEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ monaco?.editor.defineTheme("JsonEditorTheme", {
"editor.background": "#ffffff00",
"editorLineNumber.foreground": "#aaa",
"editorOverviewRuler.border": "#ffffff00",
"editor.lineHighlightBackground": "#e0f2f2",
"editor.lineHighlightBackground": "#F7F8FA",
"scrollbarSlider.background": "#E8EAEC",
"editorIndentGuide.activeBackground": "#ddd",
"editorIndentGuide.background": "#eee",
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/SectionList/index.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion web/src/pages/app/logs/index.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
"Courier New", monospace;
color: var(--chakra-colors-primary-600);
}
}
4 changes: 2 additions & 2 deletions web/src/pages/app/mods/SideBar/index.module.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.icon {
color: #888D97;
color: #888d97;
cursor: pointer;
border-radius: 4px;
height: 52px;
Expand All @@ -25,4 +25,4 @@
width: 100%;
position: absolute;
bottom: 10px;
}
}
2 changes: 1 addition & 1 deletion web/src/pages/app/mods/SideBar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export default function SideBar() {
}}
>
{item.component}
<p>{item.name ? item.name : null}</p>
<p className="scale-90">{item.name ? item.name : null}</p>
</Center>
);
})}
Expand Down
6 changes: 3 additions & 3 deletions web/src/pages/home/mods/CreateAppModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@ const CreateAppModal = (props: { application?: any; children: React.ReactElement
runtimeName: string;
};

const bundles = regions[0].bundles;

const defaultValues = {
name: application.name,
state: application.state || APP_STATUS.Running,
region: application.regionName || regions[0].name,
bundleName: application.bundleName,
bundleName: application.bundleName || bundles[0].name,
runtimeName: runtimes[0].name,
};

const bundles = regions[0].bundles;

const {
register,
handleSubmit,
Expand Down