From c497b7325f90e0256b1cdd2f34dc0a9b6ff110c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 May 2022 18:13:56 +0200 Subject: [PATCH] npm upgrade + bump fontawesome version. --- client/package.json | 28 +++++++++---------- .../assets/styles/vendor/_font-awesome.scss | 4 +-- client/src/components/controls.vue | 2 +- client/src/components/emoji.vue | 2 +- client/src/components/members.vue | 6 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/client/package.json b/client/package.json index 7968e810..43650b3b 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "neko-client", - "version": "2.0.0", + "version": "2.5.0", "description": "Client for neko streaming server", "license": "Apache License 2.0", "author": "Nurdism ", @@ -20,7 +20,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "@fortawesome/fontawesome-free": "^5.15.4", + "@fortawesome/fontawesome-free": "^6.1.1", "animejs": "^3.2.0", "axios": "^0.21.4", "date-fns": "^2.28.0", @@ -35,35 +35,35 @@ "vue-class-component": "^7.2.6", "vue-clickaway": "^2.2.2", "vue-context": "^5.2.0", - "vue-i18n": "^8.27.0", + "vue-i18n": "^8.27.1", "vue-notification": "^1.3.20", "vue-property-decorator": "^9.1.2", "vuex": "^3.5.1" }, "devDependencies": { "@types/animejs": "^3.1.4", - "@types/node": "^14.18.9", + "@types/node": "^14.18.18", "@types/vue": "^2.0.0", "@types/vue-clickaway": "^2.2.0", "@typescript-eslint/eslint-plugin": "^4.33.0", "@typescript-eslint/parser": "^4.33.0", - "@vue/cli-plugin-babel": "^4.5.15", - "@vue/cli-plugin-eslint": "^4.5.15", - "@vue/cli-plugin-typescript": "^4.5.15", - "@vue/cli-plugin-vuex": "^4.5.15", - "@vue/cli-service": "^4.5.15", + "@vue/cli-plugin-babel": "^4.5.17", + "@vue/cli-plugin-eslint": "^4.5.17", + "@vue/cli-plugin-typescript": "^4.5.17", + "@vue/cli-plugin-vuex": "^4.5.17", + "@vue/cli-service": "^4.5.17", "@vue/eslint-config-prettier": "^6.0.0", "@vue/eslint-config-typescript": "^7.0.0", - "core-js": "^3.20.3", - "emojilib": "^3.0.4", + "core-js": "^3.22.5", + "emojilib": "^3.0.6", "eslint": "^6.8.0", "eslint-plugin-prettier": "^3.4.1", "eslint-plugin-vue": "^7.20.0", - "prettier": "^2.5.1", - "sass": "^1.49.0", + "prettier": "^2.6.2", + "sass": "^1.51.0", "sass-loader": "^10.2.1", "ts-node": "^9.1.1", - "typescript": "^4.5.5", + "typescript": "^4.6.4", "vue-template-compiler": "^2.6.14" } } diff --git a/client/src/assets/styles/vendor/_font-awesome.scss b/client/src/assets/styles/vendor/_font-awesome.scss index a19b703d..7b4a7802 100644 --- a/client/src/assets/styles/vendor/_font-awesome.scss +++ b/client/src/assets/styles/vendor/_font-awesome.scss @@ -2,7 +2,7 @@ @use "sass:math"; -$fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; +$fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; $fa-font-size-base: 16px; $fa-font-display: auto; $fa-css-prefix: fa; @@ -13,7 +13,7 @@ $fa-fw-width: math.div(20em, 16); $fa-primary-opacity: 1; $fa-secondary-opacity: .4; -$fa-family-default: 'Font Awesome 5 Free'; +$fa-family-default: 'Font Awesome 6 Free'; // Import FA source files @import "~@fortawesome/fontawesome-free/scss/brands"; diff --git a/client/src/components/controls.vue b/client/src/components/controls.vue index eb6174ec..9307a12b 100644 --- a/client/src/components/controls.vue +++ b/client/src/components/controls.vue @@ -212,7 +212,7 @@ &:before { color: $background-tertiary; font-weight: 900; - font-family: 'Font Awesome 5 Free'; + font-family: 'Font Awesome 6 Free'; content: '\f3c1'; font-size: 8px; line-height: 18px; diff --git a/client/src/components/emoji.vue b/client/src/components/emoji.vue index 1e3c18e5..a45b4768 100644 --- a/client/src/components/emoji.vue +++ b/client/src/components/emoji.vue @@ -90,7 +90,7 @@ &::before { content: '\f002'; font-weight: 900; - font-family: 'Font Awesome 5 Free'; + font-family: 'Font Awesome 6 Free'; position: absolute; width: 15px; height: 15px; diff --git a/client/src/components/members.vue b/client/src/components/members.vue index 8974c3d0..45e1371d 100644 --- a/client/src/components/members.vue +++ b/client/src/components/members.vue @@ -77,7 +77,7 @@ &.self { &::before { - font-family: 'Font Awesome 5 Free'; + font-family: 'Font Awesome 6 Free'; font-weight: 900; content: '\f2bd'; background: $background-floating; @@ -97,7 +97,7 @@ &.admin { &::before { display: block; - font-family: 'Font Awesome 5 Free'; + font-family: 'Font Awesome 6 Free'; font-weight: 900; content: '\f3ed'; color: $style-primary; @@ -114,7 +114,7 @@ &.host::after { display: block; - font-family: 'Font Awesome 5 Free'; + font-family: 'Font Awesome 6 Free'; font-weight: 900; content: '\f521'; background: $style-primary;