Skip to content

Commit 49b70a6

Browse files
committed
use more UI icons
1 parent 93bab3c commit 49b70a6

9 files changed

Lines changed: 22 additions & 19 deletions

File tree

client/src/assets/main.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ a {
5151
// Awesome font icons
5252
i.fa {
5353
font-size: 1.3rem;
54+
padding: 0 0.2rem
5455
}
5556

5657
$theme: #62b6ff;

client/src/components/input/UploadDocuments.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
}
5353
"
5454
>
55-
Upload
55+
<i class="fa fa-upload"></i>
5656
</GButton>
5757
<GButton title="Cancel"
5858
plain
@@ -63,7 +63,7 @@
6363
}
6464
"
6565
>
66-
&#10006;&nbsp;cancel
66+
<i class="fa fa-close"></i>
6767
</GButton>
6868
</fieldset>
6969

client/src/components/modals/DeleteModal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
$emit('hide')
1414
}
1515
"
16-
>Confirm</GButton
16+
><i class="fa fa-check"></i></GButton
1717
>
1818
</template>
1919
</GModal>

client/src/components/modals/GModal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<slot></slot>
1111
</GCard>
1212
<form class="buttons" @submit.prevent>
13-
<GButton red title="Close" @click="$emit('hide')">Close</GButton>
13+
<GButton red title="Close" @click="$emit('hide')"><i class="fa fa-close"></i></GButton>
1414
<slot name="buttons"></slot>
1515
</form>
1616
</dialog>

client/src/components/modals/corpus/CorpusForm.vue

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
v-model="eraFrom"
2929
validityDescriptor="Before end year"
3030
placeholder="YYYY"
31-
:min="-6000"
32-
:max="2100"
33-
:step="50"
3431
:validator="
3532
(v) => {
3633
return (v ?? 0) <= (eraTo ?? 0)
@@ -47,9 +44,6 @@
4744
v-model="eraTo"
4845
validityDescriptor="After start year"
4946
placeholder="YYYY"
50-
:min="-6000"
51-
:max="2100"
52-
:step="50"
5347
:validator="
5448
(v) => {
5549
return (v ?? 0) >= (eraFrom ?? 0)
@@ -117,7 +111,7 @@
117111
</form>
118112

119113
<template #buttons>
120-
<GButton green @click="confirm" :disabled>{{ initial ? "Update" : "Create" }}</GButton>
114+
<GButton green @click="confirm" :disabled><i class="fa fa-check"></i></GButton>
121115
</template>
122116
</GModal>
123117
</template>

client/src/components/modals/corpus/UserList.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<td>
1212
<div class="usersInput">
1313
<GInput placeholder="CLARIN login (email)" v-model="newUser" @enter="setUser(newUser)" />
14-
<GButton :disabled="!newUser.length" @click="setUser(newUser)">Add</GButton>
14+
<GButton :disabled="!newUser.length" @click="setUser(newUser)"><i class="fa fa-plus"></i></GButton>
1515
</div>
1616
</td>
1717
</tr>
@@ -25,7 +25,7 @@
2525
<div class="users">
2626
<p>{{ userName }}</p>
2727
<GButton plain @click="userToDelete = userName" v-if="canDelete(userName)">
28-
&#10006;&nbsp;remove
28+
<i class="fa fa-close"></i>
2929
</GButton>
3030
</div>
3131
</li>

client/src/types/taggers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export type Tagger = {
22
id: string
33
description: string
44
tagset: string
5-
langauge: string
5+
language: string
66
eraFrom: number
77
eraTo: number
88
annotations: string[]

client/src/views/annotate/subviews/CorporaView.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
</template>
66

77
<GForm gap="0.25rem">
8-
<GButton green title="New" @click="newCorpus = true"> New </GButton>
9-
<GButton orange title="Edit" :disabled="!canWrite" @click="editCorpus = copy(corpus)"> Edit </GButton>
10-
<GButton red title="Delete" :disabled="!canDelete" @click="deleteCorpus = corpus"> Delete </GButton>
8+
<GButton green title="New" @click="newCorpus = true"><i class="fa fa-plus"></i></GButton>
9+
<GButton orange title="Edit" :disabled="!canWrite" @click="editCorpus = copy(corpus)"><i class="fa fa-pencil"></i></GButton>
10+
<GButton red title="Delete" :disabled="!canDelete" @click="deleteCorpus = corpus"><i class="fa fa-trash"></i></GButton>
1111
</GForm>
1212

1313
<!-- Owner corpus table -->

client/src/views/annotate/subviews/evaluate/subviews/EntitiesView.vue

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
<GButton v-if="data.value" class="button" @click="selectedItem = data">
4444
{{ formatNumber(data.value) }}
4545
</GButton>
46+
<template v-else>
47+
{{ formatNumber(data.value) }}
48+
</template>
4649
</template>
4750
</GTable>
4851

@@ -198,8 +201,13 @@ function convertJobsEntities(jobsEntities: JobsEntities): DocumentEntitiesRow[]
198201
// custom format because we are overriding the cell slot
199202
function formatNumber(value: unknown): string | unknown {
200203
// only tofixed if value is a float
201-
if (typeof value === "number" && !Number.isInteger(value)) {
202-
return value.toFixed(2)
204+
if (typeof value === "number") {
205+
if (!Number.isInteger(value)) {
206+
return value.toFixed(2)
207+
}
208+
if (value === 0) {
209+
return ""
210+
}
203211
}
204212
return value
205213
}

0 commit comments

Comments
 (0)