From 03a87be521599e40d166b3b972de906010e8b390 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 8 Jun 2022 13:09:26 +0200 Subject: [PATCH] Remove superfluous user theme link properties (#2058) By definition, the NavItem has an icon, which can/should not be rendered. Depending on the browser, only a small margin is visible. The icon is therefore removed. The same applies to the hover-title, which would only be displayed for collapsed menus, but does not apply to submenu entries. --- gradle/changelog/theme_nav_item.yaml | 2 ++ scm-ui/ui-webapp/public/locales/de/commons.json | 5 +---- scm-ui/ui-webapp/public/locales/en/commons.json | 5 +---- scm-ui/ui-webapp/src/containers/Profile.tsx | 7 +------ 4 files changed, 5 insertions(+), 14 deletions(-) create mode 100644 gradle/changelog/theme_nav_item.yaml diff --git a/gradle/changelog/theme_nav_item.yaml b/gradle/changelog/theme_nav_item.yaml new file mode 100644 index 0000000000..519288fe8e --- /dev/null +++ b/gradle/changelog/theme_nav_item.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Remove superfluous user theme link properties ([#2058](https://github.com/scm-manager/scm-manager/pull/2058)) diff --git a/scm-ui/ui-webapp/public/locales/de/commons.json b/scm-ui/ui-webapp/public/locales/de/commons.json index ce926c7594..fb1c740342 100644 --- a/scm-ui/ui-webapp/public/locales/de/commons.json +++ b/scm-ui/ui-webapp/public/locales/de/commons.json @@ -97,10 +97,7 @@ "error": "Fehler", "error-message": "'me' ist nicht definiert", "theme": { - "nav": { - "label": "Design", - "title": "Design wählen" - }, + "navLink": "Design", "subtitle": "Design wählen", "submit": "Anwenden", "light": { diff --git a/scm-ui/ui-webapp/public/locales/en/commons.json b/scm-ui/ui-webapp/public/locales/en/commons.json index eac53f6518..8665937830 100644 --- a/scm-ui/ui-webapp/public/locales/en/commons.json +++ b/scm-ui/ui-webapp/public/locales/en/commons.json @@ -98,10 +98,7 @@ "error": "Error", "error-message": "'me' is undefined", "theme": { - "nav": { - "label": "Theme", - "title": "Choose your Theme" - }, + "navLink": "Theme", "subtitle": "Choose your Theme", "submit": "Activate", "light": { diff --git a/scm-ui/ui-webapp/src/containers/Profile.tsx b/scm-ui/ui-webapp/src/containers/Profile.tsx index ee5f9076b8..f2dc0f6b74 100644 --- a/scm-ui/ui-webapp/src/containers/Profile.tsx +++ b/scm-ui/ui-webapp/src/containers/Profile.tsx @@ -119,12 +119,7 @@ const Profile: FC = () => { label={t("profile.settingsNavLink")} title={t("profile.settingsNavLink")} > - + {mayChangePassword && ( )}