Skip to content

Commit d18c840

Browse files
Merge branch 'main' into bc/update-bootstrap5
2 parents 7624ded + 1964ba5 commit d18c840

File tree

5 files changed

+21
-9
lines changed

5 files changed

+21
-9
lines changed

webapp/src/App.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,14 @@ body {
1414
@import url("https://fonts.googleapis.com/css?family=Figtree");
1515
@import url("https://fonts.googleapis.com/css?family=Libre+Barcode+39+Text");
1616
@import url("https://fonts.googleapis.com/css?family=Roboto+Mono");
17+
18+
:root {
19+
--font-primary: Figtree, Avenir, Arial, sans-serif;
20+
--font-monospace: "Roboto Mono", monospace;
21+
}
22+
1723
#app {
18-
font-family: Figtree, Avenir, Arial, sans-serif;
24+
font-family: var(--font-primary);
1925
-webkit-font-smoothing: antialiased;
2026
-moz-osx-font-smoothing: grayscale;
2127
/*text-align: center;*/

webapp/src/components/FileList.vue

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,9 @@ export default {
9292
methods: {
9393
formatDistance,
9494
deleteFile(event, file_id) {
95-
deleteFileFromSample(this.item_id, file_id);
96-
return false;
95+
if (window.confirm("Are you sure you want to unlink this file from this entry?")) {
96+
deleteFileFromSample(this.item_id, file_id);
97+
}
9798
},
9899
setFileSelectModalOpen() {
99100
this.$store.commit("setFileSelectModalOpenStatus", true);
@@ -109,7 +110,7 @@ export default {
109110
110111
.filelink {
111112
color: #004175;
112-
font-family: "Andalé Mono", monospace;
113+
font-family: var(--font-monospace);
113114
}
114115
115116
.filelink:hover {
@@ -130,6 +131,11 @@ export default {
130131
padding: 0.9rem 1.25rem;
131132
}
132133
134+
.delete-file-button:hover {
135+
color: #dc3545;
136+
cursor: pointer;
137+
}
138+
133139
#uppy-trigger {
134140
scroll-anchor: auto;
135141
width: 8rem;
@@ -143,7 +149,7 @@ export default {
143149
}
144150
145151
.server-name {
146-
font-family: "Andalé Mono", monospace;
152+
font-family: var(--font-monospace);
147153
font-weight: 400;
148154
/*font-style: italic;*/
149155
color: teal;

webapp/src/components/MessageBubble.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,14 @@ export default {
145145
}
146146
147147
.system-prompt-label {
148-
font-family: "Roboto Mono", monospace;
148+
font-family: var(--font-monospace);
149149
font-size: 0.875rem;
150150
fw: 600;
151151
color: rgb(100, 100, 100);
152152
}
153153
154154
.raw-content {
155-
font-family: "Roboto Mono", monospace;
155+
font-family: var(--font-monospace);
156156
font-size: 0.875rem;
157157
white-space: pre-wrap;
158158
overflow-x: auto;

webapp/src/components/QRCode.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export default {
7575

7676
<style scoped>
7777
.qrcode-text-label {
78-
font-family: "Helvetica", "Arial", "Roboto Mono";
78+
font-family: var(--font-monospace);
7979
font-size: 1.8rem;
8080
}
8181
</style>

webapp/src/components/StyledBlockInfo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ input {
123123
}
124124
125125
.filetype-li {
126-
font-family: "Roboto Mono", monospace;
126+
font-family: var(--font-monospace);
127127
}
128128
129129
#tooltip {

0 commit comments

Comments
 (0)