From 8c0b39f69b9aab72ad26035453024abde8358904 Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Wed, 26 Jun 2024 10:24:28 +0800 Subject: [PATCH] [improve] continuously supplement and improve the goals set in #2140 (#2142) --- .../routes/dashboard/dashboard.component.html | 2 +- .../routes/passport/lock/lock.component.html | 2 +- .../passport/login/login.component.html | 4 +- .../collector/collector.component.html | 4 +- .../routes/setting/tags/tags.component.html | 3 +- .../status-public.component.html | 44 ++++++++++++------- .../status-public.component.less | 2 - .../help-massage-show.component.html | 2 +- .../help-massage-show.component.less | 1 - web-app/src/styles/theme.less | 18 +++++--- 10 files changed, 50 insertions(+), 32 deletions(-) mode change 100644 => 100755 web-app/src/app/routes/passport/lock/lock.component.html mode change 100644 => 100755 web-app/src/app/routes/status-public/status-public.component.html diff --git a/web-app/src/app/routes/dashboard/dashboard.component.html b/web-app/src/app/routes/dashboard/dashboard.component.html index cb293ecf151..8cef82b0a32 100644 --- a/web-app/src/app/routes/dashboard/dashboard.component.html +++ b/web-app/src/app/routes/dashboard/dashboard.component.html @@ -291,7 +291,7 @@
-
+
diff --git a/web-app/src/app/routes/passport/login/login.component.html b/web-app/src/app/routes/passport/login/login.component.html index ca7b47f0e41..d0d701f8065 100644 --- a/web-app/src/app/routes/passport/login/login.component.html +++ b/web-app/src/app/routes/passport/login/login.component.html @@ -17,7 +17,7 @@ ~ under the License. --> -
+
@@ -70,7 +70,7 @@ - + diff --git a/web-app/src/app/routes/setting/collector/collector.component.html b/web-app/src/app/routes/setting/collector/collector.component.html index 01526e419db..709d7d63a87 100644 --- a/web-app/src/app/routes/setting/collector/collector.component.html +++ b/web-app/src/app/routes/setting/collector/collector.component.html @@ -242,7 +242,7 @@
-
+
{{ 'collector.deploy.package.github' | i18n }} -
+
diff --git a/web-app/src/app/routes/status-public/status-public.component.html b/web-app/src/app/routes/status-public/status-public.component.html old mode 100644 new mode 100755 index d59c153580d..a9ac2b7acf1 --- a/web-app/src/app/routes/status-public/status-public.component.html +++ b/web-app/src/app/routes/status-public/status-public.component.html @@ -18,7 +18,7 @@ --> -
+ -
+
{{ 'status.public.org.state.0' | i18n }} @@ -50,7 +54,11 @@ Updated {{ statusOrg.gmtUpdate | elapsedTime }}
-
+
{{ 'status.public.org.state.1' | i18n }} @@ -59,7 +67,7 @@ Updated {{ statusOrg.gmtUpdate | elapsedTime }}
-
+
{{ 'status.public.org.state.2' | i18n }} @@ -69,7 +77,7 @@
-
+
{{ component.info.name }} @@ -99,8 +107,8 @@
-
+
{{ 'status.public.org.state.0' | i18n }} @@ -147,7 +159,11 @@ Updated {{ statusOrg.gmtUpdate | elapsedTime }}
-
+
{{ 'status.public.org.state.1' | i18n }} @@ -156,7 +172,7 @@ Updated {{ statusOrg.gmtUpdate | elapsedTime }}
-
+
{{ 'status.public.org.state.2' | i18n }} @@ -170,7 +186,8 @@
@@ -194,10 +211,7 @@
-
+
{{ incident.name }} diff --git a/web-app/src/app/routes/status-public/status-public.component.less b/web-app/src/app/routes/status-public/status-public.component.less index a6b6727b4b4..7949a3d93be 100644 --- a/web-app/src/app/routes/status-public/status-public.component.less +++ b/web-app/src/app/routes/status-public/status-public.component.less @@ -29,7 +29,6 @@ font-size: 1.5rem; line-height: 2.0rem; border: 4px; - border-radius: 8px; padding: 0.75rem 1.25rem; margin: 0 auto; } @@ -38,7 +37,6 @@ width: 60%; margin: 10px auto; border: 1px dotted gray; - border-radius: 8px; } .history_block { diff --git a/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.html b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.html index 2ca617e41d4..5d4dba4fd9a 100644 --- a/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.html +++ b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.html @@ -17,7 +17,7 @@ ~ under the License. --> -
+
diff --git a/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.less b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.less index a60eb08e44b..d2de69516ec 100644 --- a/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.less +++ b/web-app/src/app/shared/components/help-massage-show/help-massage-show.component.less @@ -4,7 +4,6 @@ height: 140px; overflow-y: hidden; box-shadow: inset 1px 4px 6px 1px rgb(0 0 0 / 0.05); - border-radius: 8px; } .collapsed_content{ overflow-y: hidden; diff --git a/web-app/src/styles/theme.less b/web-app/src/styles/theme.less index cc1df7320a6..13f6b29dba8 100644 --- a/web-app/src/styles/theme.less +++ b/web-app/src/styles/theme.less @@ -24,8 +24,18 @@ background-color: #ff4081; } -.ant-btn, .ant-tag, .ant-card, .ant-input, .ant-input-affix-wrapper { - border-radius: 4px; +.br-4, .ant-btn, .ant-tag, .ant-card, .ant-collapse, .ant-select-selector, .ant-input, .ant-input-affix-wrapper { + border-radius: 4px!important; +} +.ant-radio-button-wrapper:first-child { + border-radius: 4px 0 0 4px!important; +} +.ant-radio-button-wrapper:last-child { + border-radius: 0 4px 4px 0!important; +} + +.br-8, .ant-modal-header, .ant-modal-content { + border-radius: 8px; } .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) { @@ -51,10 +61,6 @@ border-color: #ff4081; } -.ant-modal-header, .ant-modal-content { - border-radius: 8px; -} - .ant-modal-footer { text-align: center; }