From b07ba183b0982bc0629e6cd90525db84a1e1ff10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= Date: Mon, 20 Jun 2022 23:57:29 +0200 Subject: [PATCH] :arrow_up: Update FontAwesome dependancies to v6 (#3544) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ⬆️ Updating FontAwesome dependancies to v6 * 💄 Aligning new help icon in the main sidebar Co-authored-by: Jan Oberhauser --- packages/design-system/package.json | 8 ++++---- packages/editor-ui/package.json | 4 ++-- packages/editor-ui/src/components/MainSidebar.vue | 6 ++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/design-system/package.json b/packages/design-system/package.json index 8a5b366e91..ecb7f1f121 100644 --- a/packages/design-system/package.json +++ b/packages/design-system/package.json @@ -28,15 +28,15 @@ "watch:theme": "gulp watch:theme" }, "peerDependencies": { - "@fortawesome/fontawesome-svg-core": "1.x", - "@fortawesome/free-solid-svg-icons": "5.x", + "@fortawesome/fontawesome-svg-core": "6.x", + "@fortawesome/free-solid-svg-icons": "6.x", "@fortawesome/vue-fontawesome": "2.x", "core-js": "3.x" }, "devDependencies": { "@babel/core": "^7.14.6", - "@fortawesome/fontawesome-svg-core": "^1.2.35", - "@fortawesome/free-solid-svg-icons": "^5.15.3", + "@fortawesome/fontawesome-svg-core": "^6.1.1", + "@fortawesome/free-solid-svg-icons": "^6.1.1", "@fortawesome/vue-fontawesome": "^2.0.2", "@storybook/addon-actions": "^6.3.6", "@storybook/addon-essentials": "^6.3.6", diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json index 017b1b4044..b54617336f 100644 --- a/packages/editor-ui/package.json +++ b/packages/editor-ui/package.json @@ -37,8 +37,8 @@ "xss": "^1.0.10" }, "devDependencies": { - "@fortawesome/fontawesome-svg-core": "^1.2.35", - "@fortawesome/free-solid-svg-icons": "^5.15.3", + "@fortawesome/fontawesome-svg-core": "^6.1.1", + "@fortawesome/free-solid-svg-icons": "^6.1.1", "@fortawesome/vue-fontawesome": "^2.0.2", "@types/dateformat": "^3.0.0", "@types/express": "^4.17.6", diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue index d4e7a0603f..319d81d388 100644 --- a/packages/editor-ui/src/components/MainSidebar.vue +++ b/packages/editor-ui/src/components/MainSidebar.vue @@ -736,6 +736,12 @@ export default mixins( } } } + + .help-menu { + .el-submenu__title { + padding-left: 23px !important; + } + } } .about-icon {