diff --git a/package.json b/package.json index c10ae40..90a48dc 100644 --- a/package.json +++ b/package.json @@ -16,9 +16,9 @@ }, "dependencies": { "@babel/polyfill": "^7.0.0", + "@mdi/font": "^3.0.39", "file-saver": "^1.3.8", "gps-to-gpx": "git://github.com/phyks/gps-to-gpx.git#1cb5adf4dd382266d076d7df3cb5aa3a4d7dd27b", - "material-icons": "^0.2.3", "nosleep.js": "^0.7.0", "ol": "^5.3.0", "roboto-fontface": "^0.9.0", diff --git a/src/App.vue b/src/App.vue index be3c38f..4872274 100644 --- a/src/App.vue +++ b/src/App.vue @@ -21,7 +21,7 @@ > {{ unsentReportsLength }} - cloud_upload + mdi-cloud-upload - more_vert + mdi-dots-vertical @@ -54,7 +54,7 @@ - arrow_back + mdi-arrow-left
- my_location + mdi-crosshairs-gps diff --git a/src/components/PermissionsSwitches.vue b/src/components/PermissionsSwitches.vue index c66fab6..e56b614 100644 --- a/src/components/PermissionsSwitches.vue +++ b/src/components/PermissionsSwitches.vue @@ -88,13 +88,13 @@ export default { data() { return { geolocationPermissionMessages: [ - ` ${this.$t('permissions.geolocationDescription')}`, + ` ${this.$t('permissions.geolocationDescription')}`, ], permanentNotificationMessages: [ - ` ${this.$t('permissions.permanentNotificationDescription')}`, + ` ${this.$t('permissions.permanentNotificationDescription')}`, ], preventSuspendMessages: [ - ` ${this.$t('permissions.preventSuspendDescription')}`, + ` ${this.$t('permissions.preventSuspendDescription')}`, ], }; }, diff --git a/src/components/ReportCard.vue b/src/components/ReportCard.vue index 48e6af3..06e4dae 100644 --- a/src/components/ReportCard.vue +++ b/src/components/ReportCard.vue @@ -27,7 +27,7 @@ class="smallButton" @click.stop="upvote" > - thumb_up + mdi-thumb-up @@ -42,7 +42,7 @@ class="mediumButton" @click.stop="downvote" > - thumb_down + mdi-thumb-down @@ -59,7 +59,7 @@ role="button" :aria-label="$t('buttons.close')" > - close + mdi-close diff --git a/src/components/ReportIssueModal.vue b/src/components/ReportIssueModal.vue index 2868fb5..7eb463e 100644 --- a/src/components/ReportIssueModal.vue +++ b/src/components/ReportIssueModal.vue @@ -27,7 +27,7 @@ large role="button" > - {{ $t('reportIssueModal.send') }} email + {{ $t('reportIssueModal.send') }} mdi-email diff --git a/src/css/vendor/material-icons.css b/src/css/vendor/material-icons.css deleted file mode 100644 index 9aedca7..0000000 --- a/src/css/vendor/material-icons.css +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copy of the CSS file from the node_modules package, including an additional - * font-display directive. - */ -@font-face { - font-display: block; - font-family: "Material Icons"; - font-style: normal; - font-weight: 400; - src: url("../../../node_modules/material-icons/iconfont/MaterialIcons-Regular.eot"); - /* For IE6-8 */ - src: local("Material Icons"), local("MaterialIcons-Regular"), url("../../../node_modules/material-icons/iconfont/MaterialIcons-Regular.woff2") format("woff2"), url("../../../node_modules/material-icons/iconfont/MaterialIcons-Regular.woff") format("woff"), url("../../../node_modules/material-icons/iconfont/MaterialIcons-Regular.ttf") format("truetype"); -} - -.material-icons { - font-family: "Material Icons"; - font-weight: normal; - font-style: normal; - font-size: 24px; - display: inline-block; - line-height: 1; - text-transform: none; - letter-spacing: normal; - word-wrap: normal; - white-space: nowrap; - direction: ltr; - /* Support for all WebKit browsers. */ - -webkit-font-smoothing: antialiased; - /* Support for Safari and Chrome. */ - text-rendering: optimizeLegibility; - /* Support for Firefox. */ - -moz-osx-font-smoothing: grayscale; - /* Support for IE. */ - font-feature-settings: 'liga'; -} diff --git a/src/main.js b/src/main.js index 48d6c3c..1652c57 100644 --- a/src/main.js +++ b/src/main.js @@ -5,7 +5,7 @@ import '@/polyfills'; import Vue from 'vue'; import '@/css/vendor/roboto-fontface.css'; -import '@/css/vendor/material-icons.css'; +import '@mdi/font/css/materialdesignicons.css'; import 'ol/ol.css'; import 'vuetify/src/stylus/app.styl'; diff --git a/src/views/Map.vue b/src/views/Map.vue index 5490b71..a21e89e 100644 --- a/src/views/Map.vue +++ b/src/views/Map.vue @@ -39,7 +39,7 @@ :aria-label="$t('buttons.reportProblem')" v-if="!hasCenterProvidedByRoute && hasGeolocationTracking" > - report_problem + mdi-alert - report_problem + mdi-alert

diff --git a/src/vuetify.js b/src/vuetify.js index 4f86c0b..536df4e 100644 --- a/src/vuetify.js +++ b/src/vuetify.js @@ -44,4 +44,5 @@ Vue.use(Vuetify, { VTextField, VToolbar, }, + iconfont: 'mdi', }); diff --git a/yarn.lock b/yarn.lock index 376bc7e..bdc6240 100644 --- a/yarn.lock +++ b/yarn.lock @@ -676,6 +676,11 @@ version "1.4.0" resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" +"@mdi/font@^3.0.39": + version "3.0.39" + resolved "https://registry.yarnpkg.com/@mdi/font/-/font-3.0.39.tgz#8a388ec9816939eff2099120102073aecdf6e5f8" + integrity sha512-VnPxEXsiV+YP9NO7XyQEvs1tBxkmtPzib9dRq/1CqubaZy9oeP7Jmgd/IEya8Z3bVyj+NZpwS0YGZW1kvx2eFQ== + "@sindresorhus/is@^0.7.0": version "0.7.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" @@ -5721,10 +5726,6 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -material-icons@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/material-icons/-/material-icons-0.2.3.tgz#1f84d50effbb700287ba44a21bbce0339252ccaf" - math-random@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"