Skip to content

Commit 48d928f

Browse files
BenjaminCharmesBenjaminCharmes
committed
More updates
1 parent 2a0c448 commit 48d928f

14 files changed

+72
-72
lines changed

‎webapp/src/components/AddToCollectionModal.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<Modal :model-value="modelValue" @update:model-value="$emit('update:modelValue', $event)">
44
<template #header> Add to collections </template>
55
<template #body>
6-
<div class="form-row">
7-
<div class="form-group col-md-8">
6+
<div class="row">
7+
<div class="col-md-8 mb-3">
88
<label for="items-selected" class="col-form-label">Items Selected:</label>
99
<div id="items-selected" class="dynamic-input">
1010
<FormattedItemName
@@ -17,8 +17,8 @@
1717
</div>
1818
</div>
1919
</div>
20-
<div class="form-row">
21-
<div class="col-md-12 form-group">
20+
<div class="row">
21+
<div class="col-md-12 mb-3">
2222
<label id="addToCollectionLabel">Insert into collection:</label>
2323
<CollectionSelect
2424
id="collection-select"

‎webapp/src/components/CellInformation.vue‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<!-- Sample information -->
44
<div class="row">
55
<div class="col-md-8">
6-
<div id="sample-information" class="form-row">
7-
<div class="form-group col-sm-8">
8-
<label for="cell-name" class="mr-2">Name</label>
6+
<div id="sample-information" class="row">
7+
<div class="mb-3 col-sm-8">
8+
<label for="cell-name" class="form-label mr-2">Name</label>
99
<input id="cell-name" v-model="Name" class="form-control" />
1010
</div>
11-
<div class="form-group col-sm-4">
12-
<label for="cell-date" class="mr-2">Date Created</label>
11+
<div class="mb-3 col-sm-4">
12+
<label for="cell-date" class="form-labelmr-2">Date Created</label>
1313
<input
1414
id="cell-date"
1515
v-model="DateCreated"
@@ -18,23 +18,23 @@
1818
/>
1919
</div>
2020
</div>
21-
<div class="form-row">
22-
<div class="form-group col-md-3 col-sm-2 col-6 pr-2">
23-
<label for="cell-refcode">Refcode</label>
21+
<div class="row">
22+
<div class="mb-3 col-md-3 col-sm-2 col-6 pr-2">
23+
<label for="cell-refcode" class="form-label">Refcode</label>
2424
<div id="cell-refcode">
2525
<FormattedRefcode :refcode="Refcode" />
2626
</div>
2727
</div>
28-
<div class="form-group col-md-3 col-sm-3 col-6 pb-3">
28+
<div class="mb-3 col-md-3 col-sm-3 col-6 pb-3">
2929
<ToggleableCreatorsFormGroup v-model="ItemCreators" :refcode="Refcode" />
3030
</div>
3131
<div class="col-md-6 col-sm-7 pr-2">
3232
<ToggleableCollectionFormGroup v-model="Collections" />
3333
</div>
3434
</div>
35-
<div class="form-row">
36-
<div class="form-group col-sm-4 pr-2">
37-
<label for="cell-format-dropdown">Cell format</label>
35+
<div class="row">
36+
<div class="mb-3 col-sm-4 pr-2">
37+
<label for="cell-format-dropdown" class="form-label">Cell format</label>
3838
<select id="cell-format-dropdown" v-model="CellFormat" class="form-control">
3939
<option
4040
v-for="(description, key) in availableCellFormats"
@@ -45,8 +45,8 @@
4545
</option>
4646
</select>
4747
</div>
48-
<div class="form-group col-sm-8">
49-
<label for="cell-format-description">Cell format description</label>
48+
<div class="mb-3 col-sm-8">
49+
<label for="cell-format-description" class="form-label">Cell format description</label>
5050
<input
5151
id="cell-format-description"
5252
v-model="CellFormatDescription"
@@ -56,9 +56,9 @@
5656
</div>
5757
</div>
5858

59-
<div class="form-row py-4">
60-
<div class="form-group col-lg-3 col-md-4 pr-3">
61-
<label for="cell-characteristic-mass">Active mass (mg)</label>
59+
<div class="row">
60+
<div class="mb-3 col-lg-3 col-md-4">
61+
<label for="cell-characteristic-mass" class="form-label">Active mass (mg)</label>
6262
<input
6363
id="cell-characteristic-mass"
6464
v-model="CharacteristicMass"
@@ -67,12 +67,12 @@
6767
:class="{ 'red-border': isNaN(CharacteristicMass) }"
6868
/>
6969
</div>
70-
<div class="form-group col-lg-4 col-md-4 pr-3">
71-
<label for="cell-chemform">Active formula</label>
70+
<div class="mb-3 col-lg-4 col-md-4">
71+
<label for="cell-chemform" class="form-label">Active formula</label>
7272
<ChemFormulaInput id="cell-chemform" v-model="ChemForm" />
7373
</div>
74-
<div class="form-group col-lg-3 col-md-4">
75-
<label for="cell-characteristic-molar-mass">Molar mass</label>
74+
<div class="mb-3 col-lg-3 col-md-4">
75+
<label for="cell-characteristic-molar-mass" class="form-label">Molar mass</label>
7676
<input
7777
id="cell-characteristic-molar-mass"
7878
v-model="MolarMass"
@@ -84,7 +84,7 @@
8484
</div>
8585
<div class="row">
8686
<div class="col">
87-
<label id="cell-description-label">Description</label>
87+
<label id="cell-description-label" class="form-label">Description</label>
8888
<TinyMceInline
8989
v-model="SampleDescription"
9090
aria-labelledby="cell-description-label"

‎webapp/src/components/CellPreparationInformation.vue‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<template>
22
<div id="cell-preparation-information">
3-
<label class="mr-2 pb-2">Cell Construction</label>
3+
<label class="form-label mr-2 pb-2">Cell Construction</label>
44

5-
<div class="form-group ml-5">
6-
<label class="subheading cell-component-label mt-4 pb-1" for="pos-electrode-table"
5+
<div class="mb-3 ml-5">
6+
<label class="form-label subheading cell-component-label mt-4 pb-1" for="pos-electrode-table"
77
>Positive electrode</label
88
>
99
<div class="card component-card">
@@ -17,8 +17,8 @@
1717
</div>
1818
</div>
1919

20-
<div class="form-group ml-5">
21-
<label class="subheading cell-component-label mt-4 pb-1" for="electrolyte-table"
20+
<div class="mb-3 ml-5">
21+
<label class="form-label subheading cell-component-label mt-4 pb-1" for="electrolyte-table"
2222
>Electrolyte</label
2323
>
2424
<div class="card component-card">
@@ -32,8 +32,8 @@
3232
</div>
3333
</div>
3434

35-
<div class="form-group ml-5">
36-
<label class="subheading cell-component-label mt-4 pb-1" for="neg-electrode-table"
35+
<div class="mb-3 ml-5">
36+
<label class="form-label subheading cell-component-label mt-4 pb-1" for="neg-electrode-table"
3737
>Negative electrode</label
3838
>
3939
<div class="card component-card">
@@ -47,8 +47,8 @@
4747
</div>
4848
</div>
4949

50-
<div class="form-group ml-5 mt-3">
51-
<label id="synthesis-procedure-label" class="subheading">Procedure</label>
50+
<div class="mb-3 ml-5 mt-3">
51+
<label id="synthesis-procedure-label" class="form-label subheading">Procedure</label>
5252
<TinyMceInline
5353
v-model="CellPreparationDescription"
5454
aria-labelledby="synthesis-procedure-label"

‎webapp/src/components/CollectionInformation.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<div class="container">
33
<div class="row">
44
<div class="col">
5-
<div id="collection-information" class="form-row">
5+
<div id="collection-information" class="row">
66
<div class="col-md-2">
7-
<label id="creators" class="mr-2">Creators</label>
7+
<label id="creators" class="form-label mr-2">Creators</label>
88
<div>
99
<Creators :creators="CollectionCreators" :size="36" />
1010
</div>
1111
</div>
12-
<div class="form-group col">
13-
<label for="name" class="mr">Title</label>
12+
<div class="mb-3 col">
13+
<label for="name" class="form-label mr">Title</label>
1414
<input
1515
id="name"
1616
v-model="Title"
@@ -21,7 +21,7 @@
2121
</div>
2222
</div>
2323

24-
<label id="description-label" class="mr-2">Description</label>
24+
<label id="description-label" class="form-label mr-2">Description</label>
2525
<TinyMceInline
2626
v-model="CollectionDescription"
2727
aria-labelledby="description-label"

‎webapp/src/components/EquipmentInformation.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="container">
33
<!-- Item information -->
4-
<div id="equipment-information" class="form-row">
4+
<div id="equipment-information" class="row">
55
<div class="form-group col-md-2 col-sm-4">
66
<label class="mr-2">Refcode</label>
77
<div><FormattedRefcode :refcode="Refcode" /></div>
@@ -19,7 +19,7 @@
1919
<input id="equip-date" v-model="EquipmentDate" type="datetime-local" class="form-control" />
2020
</div>
2121
</div>
22-
<div class="form-row">
22+
<div class="row">
2323
<div class="form-group col-md-2">
2424
<label id="collections" class="mr-2">Collections</label>
2525
<div>
@@ -37,7 +37,7 @@
3737
<input id="equip-location" v-model="Location" class="form-control" />
3838
</div>
3939
</div>
40-
<div class="form-row">
40+
<div class="row">
4141
<div class="form-group col-md-8">
4242
<label for="equip-serial" class="mr-2">Serial no(s).</label>
4343
<input id="equip-serial" v-model="SerialNos" class="form-control" />
@@ -49,7 +49,7 @@
4949
</div>
5050
</div>
5151
</div>
52-
<div class="form-row">
52+
<div class="row">
5353
<div class="form-group col-md-8">
5454
<label for="equip-contact" class="mr-2">Contact information</label>
5555
<input id="equip-contact" v-model="Contact" class="form-control" />

‎webapp/src/components/GetEmailModal.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@update:model-value="$emit('update:modelValue', $event)"
77
>
88
<template #body>
9-
<div class="form-row">
9+
<div class="row">
1010
<div class="form-group">
1111
<label for="sample-id" class="col-form-label"
1212
>Enter your email address to receive a sign-in/registration link:</label

‎webapp/src/components/QRCodeModal.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Modal :model-value="modelValue" @update:model-value="$emit('update:modelValue', $event)">
44
<template #header>QR Code</template>
55
<template #body>
6-
<div class="form-row">
6+
<div class="row">
77
<div ref="qrcode" class="form-group mx-auto" data-testid="qrcode">
88
<QRCode :refcode="refcode" />
99
</div>

‎webapp/src/components/SampleInformation.vue‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
<!-- Sample information -->
44
<div class="row">
55
<div class="col">
6-
<div id="sample-information" class="form-row">
7-
<div class="form-group col-sm-4 pr-2">
6+
<div id="sample-information" class="row">
7+
<div class="col-sm-4 pe-2">
88
<label for="samp-name">Name</label>
99
<input id="samp-name" v-model="Name" class="form-control" />
1010
</div>
11-
<div class="form-group col-sm-4 col-6 pr-2">
11+
<div class="col-sm-4 col-6 pe-2">
1212
<label for="samp-chemform">Chemical formula</label>
1313
<ChemFormulaInput id="samp-chemform" v-model="ChemForm" />
1414
</div>
15-
<div class="form-group col-sm-4 col-6">
15+
<div class="col-sm-4 col-6">
1616
<label for="samp-date">Date Created</label>
1717
<input
1818
id="samp-date"
@@ -22,21 +22,21 @@
2222
/>
2323
</div>
2424
</div>
25-
<div class="form-row">
26-
<div class="form-group col-md-3 col-sm-2 col-6">
25+
<div class="row">
26+
<div class="col-md-3 col-sm-2 col-6">
2727
<label for="samp-refcode">Refcode</label>
2828
<div id="samp-refcode">
2929
<FormattedRefcode :refcode="Refcode" />
3030
</div>
3131
</div>
32-
<div class="form-group col-md-3 col-sm-3 col-6 pb-3">
32+
<div class="col-md-3 col-sm-3 col-6 pb-3">
3333
<ToggleableCreatorsFormGroup v-model="ItemCreators" :refcode="Refcode" />
3434
</div>
35-
<div class="col-md-6 col-sm-7 pr-2">
35+
<div class="col-md-6 col-sm-7 pe-2">
3636
<ToggleableCollectionFormGroup v-model="Collections" />
3737
</div>
3838
</div>
39-
<div class="form-row">
39+
<div class="row">
4040
<div class="col">
4141
<label id="samp-description-label">Description</label>
4242
<TinyMceInline v-model="SampleDescription" aria-labelledby="samp-description-label" />

‎webapp/src/components/StartingMaterialInformation.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="container-lg px-5 px-lg-0">
33
<!-- Sample information -->
4-
<div id="starting-material-information" class="form-row">
4+
<div id="starting-material-information" class="row">
55
<div class="form-group col-md-2 col-sm-3 col-6">
66
<label for="startmat-refcode">Refcode</label>
77
<div id="startmat-refcode"><FormattedRefcode :refcode="Refcode" /></div>
@@ -15,7 +15,7 @@
1515
<StyledInput id="startmat-name" v-model="Name" :readonly="!isEditable" />
1616
</div>
1717
</div>
18-
<div class="form-row">
18+
<div class="row">
1919
<div class="form-group col-lg-3 col-sm-4">
2020
<label for="startmat-chemform">Chemical formula</label>
2121
<ChemFormulaInput v-if="isEditable" id="startmat-chemform" v-model="ChemForm" />
@@ -32,7 +32,7 @@
3232
<StyledInput id="startmat-purity" v-model="ChemicalPurity" :readonly="!isEditable" />
3333
</div>
3434
</div>
35-
<div class="form-row">
35+
<div class="row">
3636
<div class="form-group col-lg-3 col-sm-4">
3737
<label for="startmat-date-acquired">Date acquired</label>
3838
<StyledInput
@@ -57,7 +57,7 @@
5757
</div>
5858
</div>
5959

60-
<div class="form-row">
60+
<div class="row">
6161
<div class="form-group col-lg-3 col-sm-4">
6262
<label for="startmat-cas">CAS</label>
6363
<StyledInput id="startmat-cas" v-model="CAS" :readonly="!isEditable" />

‎webapp/src/components/datablocks/ChatBlock.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ DataBlockBase as a prop, and save from within DataBlockBase -->
2525
<label>Current conversation token count:</label>
2626
<span class="pl-1">{{ tokenCount }}/ {{ modelObj.context_window }}</span>
2727
</div>
28-
<div class="form-row input-group">
28+
<div class="row input-group">
2929
<label>est. cost for next message:</label>
3030
<span class="pl-1">${{ estimatedCost.toPrecision(2) }}</span>
3131
</div>
3232

33-
<div class="form-row input-group">
33+
<div class="row input-group">
3434
<label for="temperatureInput" class="mr-2"><b>temperature:</b></label>
3535
<input
3636
id="temperatureInput"

0 commit comments

Comments
 (0)