diff --git a/frontend/package.json b/frontend/package.json index 48b2100e1..24922b0f4 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -72,7 +72,12 @@ }, "devDependencies": { "@apollo/client": "^3.10.8", + "@iconify-json/arcticons": "^1.2.20", "@iconify-json/bi": "^1.1.23", + "@iconify-json/fa": "^1.2.1", + "@iconify-json/humbleicons": "^1.2.6", + "@iconify-json/ion": "^1.2.2", + "@iconify-json/mdi": "^1.2.3", "@intlify/eslint-plugin-vue-i18n": "^1.4.0", "@vitest/coverage-v8": "^2.0.5", "@vue/eslint-config-prettier": "^4.0.1", diff --git a/frontend/public/img/loupe.png b/frontend/public/img/loupe.png deleted file mode 100644 index ab289e4ad..000000000 Binary files a/frontend/public/img/loupe.png and /dev/null differ diff --git a/frontend/public/img/svg/circles.svg b/frontend/public/img/svg/circles.svg deleted file mode 100644 index 5deb96d1b..000000000 --- a/frontend/public/img/svg/circles.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/frontend/public/img/svg/community.svg b/frontend/public/img/svg/community.svg deleted file mode 100644 index 8f1cdbd61..000000000 --- a/frontend/public/img/svg/community.svg +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/public/img/svg/home.svg b/frontend/public/img/svg/home.svg deleted file mode 100644 index 9122b7e68..000000000 --- a/frontend/public/img/svg/home.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - diff --git a/frontend/public/img/svg/info.svg b/frontend/public/img/svg/info.svg deleted file mode 100644 index 0510a5b60..000000000 --- a/frontend/public/img/svg/info.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - diff --git a/frontend/public/img/svg/logout.svg b/frontend/public/img/svg/logout.svg deleted file mode 100644 index a9826a5dd..000000000 --- a/frontend/public/img/svg/logout.svg +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/public/img/svg/my_profil.svg b/frontend/public/img/svg/my_profil.svg deleted file mode 100644 index ef41c2ef4..000000000 --- a/frontend/public/img/svg/my_profil.svg +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/public/img/svg/qr-code.svg b/frontend/public/img/svg/qr-code.svg deleted file mode 100644 index 3cbd987c4..000000000 --- a/frontend/public/img/svg/qr-code.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/frontend/public/img/svg/send.svg b/frontend/public/img/svg/send.svg deleted file mode 100644 index 6f1d8dafa..000000000 --- a/frontend/public/img/svg/send.svg +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/public/img/svg/settings.svg b/frontend/public/img/svg/settings.svg deleted file mode 100644 index 6966262f3..000000000 --- a/frontend/public/img/svg/settings.svg +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/public/img/svg/transaction.svg b/frontend/public/img/svg/transaction.svg deleted file mode 100644 index f7cb156ff..000000000 --- a/frontend/public/img/svg/transaction.svg +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/src/assets/scss/custom/gradido-custom/_color.scss b/frontend/src/assets/scss/custom/gradido-custom/_color.scss index b741f6be3..b2d2fe9da 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_color.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_color.scss @@ -20,6 +20,7 @@ $gradido-197: rgb(197 141 56) ; $gradido-209: rgb(209 209 209) ; $gradido-4: rgb(4 112 6) ; $gradido-56: rgb(56 56 56) ; +$gradido-114: rgb(114 119 143) ; $black: #000 ; $grays: () ; $grays: map.merge( diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss index 6a872ee37..1a8ef07d6 100644 --- a/frontend/src/assets/scss/gradido.scss +++ b/frontend/src/assets/scss/gradido.scss @@ -53,3 +53,4 @@ @import "auth-navbar"; +@import "navbar"; diff --git a/frontend/src/assets/scss/navbar.scss b/frontend/src/assets/scss/navbar.scss new file mode 100644 index 000000000..a2d948d76 --- /dev/null +++ b/frontend/src/assets/scss/navbar.scss @@ -0,0 +1,5 @@ +svg.svg-icon { + height: 20px; + width:20px; + color: $gradido-114; +} diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue index 706d0ead5..361681f55 100644 --- a/frontend/src/components/Menu/Sidebar.vue +++ b/frontend/src/components/Menu/Sidebar.vue @@ -10,43 +10,43 @@ @@ -61,7 +61,7 @@ > diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue index 6cc086e0f..2f414f894 100644 --- a/frontend/src/components/TransactionLinks/TransactionLink.vue +++ b/frontend/src/components/TransactionLinks/TransactionLink.vue @@ -35,7 +35,7 @@ class="pt-3 pb-3 test-qr-code" @click.stop="toggleQrModal" > - + {{ $t('qrCode') }} diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 9eb891787..e85293e88 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1104,6 +1104,13 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3" integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA== +"@iconify-json/arcticons@^1.2.20": + version "1.2.20" + resolved "https://registry.yarnpkg.com/@iconify-json/arcticons/-/arcticons-1.2.20.tgz#11f3dccd50883702ba36f0e87b009e4c1690a1a7" + integrity sha512-OhAmLjf8KAGKX9Uo4ionTp1znYScjb65h8YaPtR8vWIkK0A6acHucld7MkgL0aMLvnQ+Npph6K4NYCDZeL5f1g== + dependencies: + "@iconify/types" "*" + "@iconify-json/bi@^1.1.23": version "1.2.2" resolved "https://registry.yarnpkg.com/@iconify-json/bi/-/bi-1.2.2.tgz#0f64d20323904f11546cadd0dc75f2fd024a46f8" @@ -1111,6 +1118,34 @@ dependencies: "@iconify/types" "*" +"@iconify-json/fa@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@iconify-json/fa/-/fa-1.2.1.tgz#9ccfad18e1ac1011f088d487aadc35bf45fa2807" + integrity sha512-aY2+tQNWq5ch+ShtAz3KKbNrFfwf4BPrXvyN7S4/lcf6Wms+kIxsd7C7KortzHZhoBnbhVN+qo+YUWLW7rLs9Q== + dependencies: + "@iconify/types" "*" + +"@iconify-json/humbleicons@^1.2.6": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@iconify-json/humbleicons/-/humbleicons-1.2.6.tgz#00189eaaf590ff80feeba05c1c5793dc7efe4c79" + integrity sha512-B5Ayka2mYbT8BxltoOEebe8XPfq0vpt2vzTGt/WJmapsapaLfAm00KdSEgIJ58VcBPWPtPI94FQ/97Yi/RAtAw== + dependencies: + "@iconify/types" "*" + +"@iconify-json/ion@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@iconify-json/ion/-/ion-1.2.2.tgz#ec1afaa19b82c2856eaa6a0ec976209538cd1bae" + integrity sha512-GysHYDAyy3K4R2Xxsab3I0ZFmQA4oorfIkwX0g6xfZJNVZcFyAlA4pa1jAJC9Bk3cLiWUtnN8ZyWs6cP3nxlnw== + dependencies: + "@iconify/types" "*" + +"@iconify-json/mdi@^1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@iconify-json/mdi/-/mdi-1.2.3.tgz#5e4ee9d8c8aaad04381c8cc6c6edbe3327f031b5" + integrity sha512-O3cLwbDOK7NNDf2ihaQOH5F9JglnulNDFV7WprU2dSoZu3h3cWH//h74uQAB87brHmvFVxIOkuBX2sZSzYhScg== + dependencies: + "@iconify/types" "*" + "@iconify/types@*", "@iconify/types@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@iconify/types/-/types-2.0.0.tgz#ab0e9ea681d6c8a1214f30cd741fe3a20cc57f57"