From 3da8e573a0f0876e90589af670317e110c689cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E4=B8=96=E5=86=9B?= <30999793+AllForNothing@users.noreply.github.com> Date: Fri, 22 Oct 2021 10:09:16 +0800 Subject: [PATCH] Fix css issues for robot and replication (#15834) Signed-off-by: AllForNothing --- .../create-edit-rule/create-edit-rule.component.html | 6 +++++- .../create-edit-rule/create-edit-rule.component.scss | 9 +++++++++ .../robot-account/add-robot/add-robot.component.html | 2 +- .../robot-account/add-robot/add-robot.component.scss | 5 ++++- src/portal/src/i18n/lang/de-de-lang.json | 1 + src/portal/src/i18n/lang/en-us-lang.json | 1 + src/portal/src/i18n/lang/es-es-lang.json | 1 + src/portal/src/i18n/lang/fr-fr-lang.json | 1 + src/portal/src/i18n/lang/pt-br-lang.json | 1 + src/portal/src/i18n/lang/tr-tr-lang.json | 1 + src/portal/src/i18n/lang/zh-cn-lang.json | 1 + src/portal/src/i18n/lang/zh-tw-lang.json | 1 + 12 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html index 77fa07e11..24b851ac3 100644 --- a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html +++ b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html @@ -116,11 +116,15 @@ placeholder="select labels"> - + + diff --git a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.scss b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.scss index 844a3125d..3481974ab 100644 --- a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.scss +++ b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.scss @@ -265,8 +265,17 @@ clr-modal { width: 6rem; } .right-align { + min-width: 204px; + overflow-y: auto; transform: translateX(-4.3rem) translateY(1.25rem)!important; } +.dropdown-item { + min-height: 26px; +} +.no-labels { + cursor: default; + padding: 0 0.5rem; +} .unit { width: 4.18rem !important; } diff --git a/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.html b/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.html index b391e0e47..47a6a5d20 100644 --- a/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.html +++ b/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.html @@ -95,7 +95,7 @@ {{getPermissions()}} {{"SYSTEM_ROBOT.PERMISSIONS" | translate}} - +
{{i18nMap[item.action] | translate}} {{i18nMap[item.resource] | translate}} diff --git a/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.scss b/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.scss index 596064d22..81d056e46 100644 --- a/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.scss +++ b/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.scss @@ -53,4 +53,7 @@ min-height: 20px; display: flex; align-items: center; -} \ No newline at end of file +} +.overflow-y-scroll { + overflow-y: auto; +} diff --git a/src/portal/src/i18n/lang/de-de-lang.json b/src/portal/src/i18n/lang/de-de-lang.json index af8b176ba..86d70c204 100644 --- a/src/portal/src/i18n/lang/de-de-lang.json +++ b/src/portal/src/i18n/lang/de-de-lang.json @@ -597,6 +597,7 @@ "PLACEHOLDER": "Es konnten keine Replikations-Regeln gefunden werden!", "JOB_PLACEHOLDER": "Es konnten keine Replikations-Jobs gefunden werden!", "NO_ENDPOINT_INFO": "Bitte zuerst einen Endpunkt hinzufügen", + "NO_LABEL_INFO": "Please add a label first", "NO_PROJECT_INFO": "Dieses Projekt existiert nicht", "SOURCE_RESOURCE_FILTER": "Quellen-Filter", "SCHEDULED": "Geplant", diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json index 206c5eeea..0aacbb973 100644 --- a/src/portal/src/i18n/lang/en-us-lang.json +++ b/src/portal/src/i18n/lang/en-us-lang.json @@ -597,6 +597,7 @@ "PLACEHOLDER": "We couldn't find any replication rules!", "JOB_PLACEHOLDER": "We couldn't find any replication jobs!", "NO_ENDPOINT_INFO": "Please add an endpoint first", + "NO_LABEL_INFO": "Please add a label first", "NO_PROJECT_INFO": "This project is not exist", "SOURCE_RESOURCE_FILTER": "Source resource filter", "SCHEDULED": "Scheduled", diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json index 76e620e9d..a53ee5af8 100644 --- a/src/portal/src/i18n/lang/es-es-lang.json +++ b/src/portal/src/i18n/lang/es-es-lang.json @@ -599,6 +599,7 @@ "PLACEHOLDER": "We couldn't find any replication rules!", "JOB_PLACEHOLDER": "We couldn't find any replication jobs!", "NO_ENDPOINT_INFO": "Please add an endpoint first", + "NO_LABEL_INFO": "Please add a label first", "NO_PROJECT_INFO": "This project is not exist", "SOURCE_RESOURCE_FILTER": "Source resource filter", "SCHEDULED": "Scheduled", diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json index d4a0cf9b5..8c7113680 100644 --- a/src/portal/src/i18n/lang/fr-fr-lang.json +++ b/src/portal/src/i18n/lang/fr-fr-lang.json @@ -587,6 +587,7 @@ "PLACEHOLDER": "Nous n'avons trouvé aucune règle de réplication !", "JOB_PLACEHOLDER": "Nous n'avons trouvé aucun travail de réplication !", "NO_ENDPOINT_INFO": "Please add an endpoint first", + "NO_LABEL_INFO": "Please add a label first", "NO_PROJECT_INFO": "This project is not exist", "SOURCE_RESOURCE_FILTER": "Source resource filter", "SCHEDULED": "Scheduled", diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json index 9173cb38d..1736c4b3a 100644 --- a/src/portal/src/i18n/lang/pt-br-lang.json +++ b/src/portal/src/i18n/lang/pt-br-lang.json @@ -597,6 +597,7 @@ "PLACEHOLDER": "Não foi possível encontrar nenhuma regra de replicação!", "JOB_PLACEHOLDER": "Não foi possível encontrar nenhuma tarefa de replicação!", "NO_ENDPOINT_INFO": "Por favor adicione antes um endpoint", + "NO_LABEL_INFO": "Please add a label first", "NO_PROJECT_INFO": "Esse projeto não existe", "SOURCE_RESOURCE_FILTER": "Filtro de recursos da origem", "SCHEDULED": "Agendado", diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json index f69cca0ef..88bf0cf86 100644 --- a/src/portal/src/i18n/lang/tr-tr-lang.json +++ b/src/portal/src/i18n/lang/tr-tr-lang.json @@ -597,6 +597,7 @@ "PLACEHOLDER": "Herhangi bir çoğaltma kuralı bulamadık!", "JOB_PLACEHOLDER": "Çoğaltma işi bulamadık!", "NO_ENDPOINT_INFO": "Lütfen önce bir uç noktası ekleyin", + "NO_LABEL_INFO": "Please add a label first", "NO_PROJECT_INFO": "Bu proje mevcut değil", "SOURCE_RESOURCE_FILTER": "Kaynak vasıtası filtresi", "SCHEDULED": "Belirlenmiş", diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index 0d14afe45..952c651cf 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -599,6 +599,7 @@ "PLACEHOLDER": "未发现任何复制规则!", "JOB_PLACEHOLDER": "未发现任何复制任务!", "NO_ENDPOINT_INFO": "请先添加一个目标", + "NO_LABEL_INFO": "请先添加一个标签", "NO_PROJECT_INFO": "此项目不存在", "SOURCE_RESOURCE_FILTER": "源资源过滤器", "SCHEDULED": "定时", diff --git a/src/portal/src/i18n/lang/zh-tw-lang.json b/src/portal/src/i18n/lang/zh-tw-lang.json index 4f6654c95..a01bc373e 100644 --- a/src/portal/src/i18n/lang/zh-tw-lang.json +++ b/src/portal/src/i18n/lang/zh-tw-lang.json @@ -594,6 +594,7 @@ "PLACEHOLDER": "未發現任何復制規則!", "JOB_PLACEHOLDER": "未發現任何復制任務!", "NO_ENDPOINT_INFO": "請先添加一個目標", + "NO_LABEL_INFO": "Please add a label first", "NO_PROJECT_INFO": "此項目不存在", "SOURCE_RESOURCE_FILTER": "源資源過濾器", "SCHEDULED": "定時",