From 9c9dd61735be3341f683ede76ca586bba023fb27 Mon Sep 17 00:00:00 2001 From: Christoph Wiechert Date: Tue, 18 Jul 2017 13:55:47 +0200 Subject: [PATCH] svg inline fontawesome icons --- app/package.json | 1 + app/src/Admin.vue | 14 +++++++++----- app/src/Download.vue | 22 +++++++++++++++------- app/src/Download/PreviewModal.vue | 9 ++++++--- app/src/Upload.vue | 27 +++++++++++++++++++-------- app/src/Upload/Files.vue | 12 ++++++++---- app/src/Upload/Settings.vue | 3 ++- app/src/admin.js | 2 ++ app/src/common/Clipboard.vue | 8 ++++++-- app/src/common/FileIcon.vue | 24 ++++++++++++++---------- app/src/download.js | 3 +++ app/src/upload.js | 5 +++-- public/assets/styles.css | 10 ++++++++++ public/html/admin.html | 5 +++-- public/html/download.html | 5 +++-- public/html/error.html | 5 +++-- public/html/upload.html | 5 +++-- 17 files changed, 110 insertions(+), 50 deletions(-) diff --git a/app/package.json b/app/package.json index d0c3462..28d6fad 100644 --- a/app/package.json +++ b/app/package.json @@ -15,6 +15,7 @@ "tus-js-client": "^1.4.3", "uuid": "^3.0.1", "vue": "^2.3.2", + "vue-awesome": "^2.3.1", "vuex": "^2.3.1" }, "devDependencies": { diff --git a/app/src/Admin.vue b/app/src/Admin.vue index 27b4212..a2fdd9c 100644 --- a/app/src/Admin.vue +++ b/app/src/Admin.vue @@ -1,11 +1,11 @@ @@ -42,6 +42,10 @@ import {mapState} from 'vuex'; import dragDrop from 'drag-drop'; import FileIcon from '../common/FileIcon.vue'; + import 'vue-awesome/icons/plus' + import 'vue-awesome/icons/plus-circle' + import 'vue-awesome/icons/times' + import 'vue-awesome/icons/exclamation-triangle' export default { name: 'Files', diff --git a/app/src/Upload/Settings.vue b/app/src/Upload/Settings.vue index 1f27fd6..90ff4a1 100644 --- a/app/src/Upload/Settings.vue +++ b/app/src/Upload/Settings.vue @@ -17,12 +17,13 @@ @input="$store.commit('upload/PASSWORD', $event.target.value)", :disabled='disabled', placeholder='optional') span.input-group-addon(style='cursor: pointer', title='generate password', @click='generatePassword()') - i.fa.fa-key + icon(name="key")