summaryrefslogtreecommitdiff
path: root/src/client/app/common
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-11-13 22:43:09 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-11-13 22:43:09 +0900
commit54710f17fc7a6f05970491cf5e174380f519e90f (patch)
treee3a9f3439bb6127f5729322b586b09aa4e0cc124 /src/client/app/common
parent[Client] Fix bug (diff)
downloadmisskey-54710f17fc7a6f05970491cf5e174380f519e90f.tar.gz
misskey-54710f17fc7a6f05970491cf5e174380f519e90f.tar.bz2
misskey-54710f17fc7a6f05970491cf5e174380f519e90f.zip
[Client] Some performance optimizations
Diffstat (limited to 'src/client/app/common')
-rw-r--r--src/client/app/common/views/components/emoji-picker.vue18
-rw-r--r--src/client/app/common/views/widgets/server.memory.vue2
2 files changed, 11 insertions, 9 deletions
diff --git a/src/client/app/common/views/components/emoji-picker.vue b/src/client/app/common/views/components/emoji-picker.vue
index 3d1dbd23ad..8181047167 100644
--- a/src/client/app/common/views/components/emoji-picker.vue
+++ b/src/client/app/common/views/components/emoji-picker.vue
@@ -37,6 +37,8 @@
import Vue from 'vue';
import i18n from '../../../i18n';
import { lib } from 'emojilib';
+import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice } from '@fortawesome/free-solid-svg-icons';
+import { faHeart, faFlag } from '@fortawesome/free-regular-svg-icons';
export default Vue.extend({
i18n: i18n('common/views/components/emoji-picker.vue'),
@@ -48,7 +50,7 @@ export default Vue.extend({
categories: [{
ref: 'customEmojiSection',
text: this.$t('custom-emoji'),
- icon: ['fas', 'asterisk'],
+ icon: faAsterisk,
isActive: true
}, {
name: 'people',
@@ -60,43 +62,43 @@ export default Vue.extend({
name: 'animals_and_nature',
ref: 'animalsAndNatureSection',
text: this.$t('animals-and-nature'),
- icon: ['fas', 'leaf'],
+ icon: faLeaf,
isActive: false
}, {
name: 'food_and_drink',
ref: 'foodAndDrinkSection',
text: this.$t('food-and-drink'),
- icon: ['fas', 'utensils'],
+ icon: faUtensils,
isActive: false
}, {
name: 'activity',
ref: 'activitySection',
text: this.$t('activity'),
- icon: ['fas', 'futbol'],
+ icon: faFutbol,
isActive: false
}, {
name: 'travel_and_places',
ref: 'travelAndPlacesSection',
text: this.$t('travel-and-places'),
- icon: ['fas', 'city'],
+ icon: faCity,
isActive: false
}, {
name: 'objects',
ref: 'objectsSection',
text: this.$t('objects'),
- icon: ['fas', 'poo-storm'],
+ icon: faDice,
isActive: false
}, {
name: 'symbols',
ref: 'symbolsSection',
text: this.$t('symbols'),
- icon: ['far', 'heart'],
+ icon: faHeart,
isActive: false
}, {
name: 'flags',
ref: 'flagsSection',
text: this.$t('flags'),
- icon: ['far', 'flag'],
+ icon: faFlag,
isActive: false
}]
}
diff --git a/src/client/app/common/views/widgets/server.memory.vue b/src/client/app/common/views/widgets/server.memory.vue
index d7ad04b08f..c3b2f3a101 100644
--- a/src/client/app/common/views/widgets/server.memory.vue
+++ b/src/client/app/common/views/widgets/server.memory.vue
@@ -2,7 +2,7 @@
<div class="memory">
<x-pie class="pie" :value="usage"/>
<div>
- <p><fa icon="flask"/>Memory</p>
+ <p><fa icon="memory"/>Memory</p>
<p>Total: {{ total | bytes(1) }}</p>
<p>Used: {{ used | bytes(1) }}</p>
<p>Free: {{ free | bytes(1) }}</p>