Merge remote-tracking branch 'origin/dev' into highlight-duplicate-author

jspaaks · jspaaks · commit 6cae35ec44eb · 2022-06-09T17:06:27.000+02:00
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,8 +1,7 @@
 {
   "recommendations": [
     "dbaeumer.vscode-eslint",
-    
-    "octref.vetur"
+    "Vue.volar"
   ],
   "unwantedRecommendations": [
     "hookyqr.beautify",
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,4 @@
 {
-  "vetur.validation.template": false,
-  "vetur.format.enable": false,
   "eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"],
-  "typescript.tsdk": "node_modules/typescript/lib",
-  "vetur.experimental.templateInterpolationService": true
+  "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/README.dev.md b/README.dev.md
@@ -10,7 +10,6 @@ If you are looking for user documentation, go [here](README.md).
 
 - VSCode extensions: https://code.visualstudio.com/
   - https://marketplace.visualstudio.com/items?itemName=Vue.volar
-  - https://marketplace.visualstudio.com/items?itemName=octref.vetur
   - https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint
 - WebStorm: https://www.jetbrains.com/webstorm/
 - Atom: https://atom.io/
diff --git a/quasar.conf.js b/quasar.conf.js
@@ -94,6 +94,7 @@ module.exports = configure(function () {
                     accent: '#9C27B0',
 
                     formcard: '#efefef',
+                    prose: '#333',
 
                     dark: '#333',
 
diff --git a/src/components/AuthorCardEditing.vue b/src/components/AuthorCardEditing.vue
@@ -5,10 +5,10 @@
         class="bg-formcard q-pa-md"
     >
         <div class="row">
-            <q-label class="question">
+            <h3 class="subquestion">
                 The person's given names
                 <SchemaGuideLink anchor="#definitionspersongiven-names" />
-            </q-label>
+            </h3>
         </div>
         <div class="row">
             <q-input
@@ -28,9 +28,9 @@
             />
         </div>
         <div class="row">
-            <q-label class="question">
+            <h3 class="subquestion">
                 The person's last names, split into parts
-            </q-label>
+            </h3>
         </div>
         <div class="row">
             <q-input
@@ -89,10 +89,10 @@
             </q-input>
         </div>
         <div class="row">
-            <q-label class="question">
+            <h3 class="subquestion">
                 The person's email address
                 <SchemaGuideLink anchor="#definitionsperson-email" />
-            </q-label>
+            </h3>
         </div>
         <div class="row">
             <q-input
@@ -112,14 +112,14 @@
             />
         </div>
         <div class="row">
-            <q-label class="question col">
+            <h3 class="subquestion col">
                 The person's affiliation
                 <SchemaGuideLink anchor="#definitionsperson-affiliation" />
-            </q-label>
-            <q-label class="question col">
+            </h3>
+            <h3 class="subquestion col">
                 The person's ORCID
                 <SchemaGuideLink anchor="#definitionsperson-orcid" />
-            </q-label>
+            </h3>
         </div>
         <div class="row">
             <q-input
diff --git a/src/components/IdentifierCardEditing.vue b/src/components/IdentifierCardEditing.vue
@@ -16,10 +16,10 @@
             </div>
             <div class="q-mt-md items-center no-wrap">
                 <div class="row">
-                    <q-label class="question">
+                    <h3 class="subquestion">
                         What is the value of the {{ label }}?
                         <SchemaGuideLink v-bind:anchor="anchor" />
-                    </q-label>
+                    </h3>
                 </div>
                 <q-input
                     autofocus
@@ -38,10 +38,10 @@
             </div>
             <div class="q-mt-md items-center no-wrap">
                 <div class="row">
-                    <q-label class="question">
+                    <h3 class="subquestion">
                         What is the description for the {{ label }}?
                         <SchemaGuideLink anchor="#definitionsidentifier-description" />
-                    </q-label>
+                    </h3>
                 </div>
                 <q-input
                     bg-color="white"
diff --git a/src/components/ScreenAbstract.vue b/src/components/ScreenAbstract.vue
@@ -11,10 +11,10 @@
         </div>
 
         <div id="form-content">
-            <p class="question">
+            <h2 class="question">
                 Please provide a description of the work
                 <SchemaGuideLink anchor="#abstract" />
-            </p>
+            </h2>
             <q-input
                 autogrow
                 bg-color="white"
diff --git a/src/components/ScreenAuthors.vue b/src/components/ScreenAuthors.vue
@@ -10,10 +10,10 @@
         </div>
 
         <div id="form-content">
-            <p class="question">
+            <h2 class="question">
                 Who are the author(s) of the work?
                 <SchemaGuideLink anchor="#authors" />
-            </p>
+            </h2>
             <div class="scroll-to-bottom-container">
                 <span class="bottom" />
                 <div>
diff --git a/src/components/ScreenIdentifiers.vue b/src/components/ScreenIdentifiers.vue
@@ -10,10 +10,10 @@
         </div>
 
         <div id="form-content">
-            <p class="question">
+            <h2 class="question">
                 What persistent identifiers are available for the work?
                 <SchemaGuideLink anchor="#identifiers" />
-            </p>
+            </h2>
             <div class="scroll-to-bottom-container">
                 <span class="bottom" />
                 <div>
diff --git a/src/components/ScreenKeywords.vue b/src/components/ScreenKeywords.vue
@@ -10,10 +10,10 @@
         </div>
 
         <div id="form-content">
-            <p class="question">
+            <h2 class="question">
                 What keywords describe the work?
                 <SchemaGuideLink anchor="#keywords" />
-            </p>
+            </h2>
             <div class="scroll-to-bottom-container">
                 <span class="bottom" />
                 <div>
diff --git a/src/components/ScreenLicense.vue b/src/components/ScreenLicense.vue
@@ -10,10 +10,10 @@
         </div>
 
         <div id="form-content">
-            <p class="question">
+            <h2 class="question">
                 What is the license of the work?
                 <SchemaGuideLink anchor="#license" />
-            </p>
+            </h2>
             <q-select
                 bg-color="white"
                 label="license"
diff --git a/src/components/ScreenRelatedResources.vue b/src/components/ScreenRelatedResources.vue
@@ -10,10 +10,10 @@
         </div>
 
         <div id="form-content">
-            <p class="question">
+            <h2 class="question">
                 What is the URL of the work in a source code repository?
                 <SchemaGuideLink anchor="#repository-code" />
-            </p>
+            </h2>
             <q-input
                 bg-color="white"
                 label="repository-code"
@@ -26,10 +26,10 @@
                 v-on:update:modelValue="setRepositoryCode"
             />
 
-            <p class="question">
+            <h2 class="question">
                 What is the URL of a landing page/website for the work?
                 <SchemaGuideLink anchor="#url" />
-            </p>
+            </h2>
             <q-input
                 bg-color="white"
                 label="url"
@@ -42,10 +42,10 @@
                 v-on:update:modelValue="setUrl"
             />
 
-            <p class="question">
+            <h2 class="question">
                 What is the URL of the work in a repository?
                 <SchemaGuideLink anchor="#repository" />
-            </p>
+            </h2>
             <q-input
                 bg-color="white"
                 label="repository"
@@ -58,10 +58,10 @@
                 v-on:update:modelValue="setRepository"
             />
 
-            <p class="question">
+            <h2 class="question">
                 What is the URL of the work in a build artifact/binary repository?
                 <SchemaGuideLink anchor="#repository-artifact" />
-            </p>
+            </h2>
             <q-input
                 bg-color="white"
                 label="repository-artifact"
diff --git a/src/components/ScreenStart.vue b/src/components/ScreenStart.vue
@@ -11,10 +11,10 @@
         </div>
 
         <div id="form-content">
-            <p class="question">
+            <h2 class="question">
                 What is the title of the work?
                 <SchemaGuideLink anchor="#title" />
-            </p>
+            </h2>
             <q-input
                 bg-color="white"
                 label="title"
@@ -26,10 +26,10 @@
                 v-bind:error-message="titleErrors.join(', ')"
                 v-on:update:modelValue="setTitle"
             />
-            <p class="question">
+            <h2 class="question">
                 What do you want citers to do with the information provided in your CITATION.cff file?
                 <SchemaGuideLink anchor="#message" />
-            </p>
+            </h2>
             <q-input
                 bg-color="white"
                 label="message"
@@ -62,10 +62,10 @@
                     </q-btn-dropdown>
                 </template>
             </q-input>
-            <p class="question">
+            <h2 class="question">
                 What type of work does this CITATION.cff describe?
                 <SchemaGuideLink anchor="#type" />
-            </p>
+            </h2>
             <q-option-group
                 type="radio"
                 v-bind:model-value="type"
diff --git a/src/components/ScreenVersionSpecific.vue b/src/components/ScreenVersionSpecific.vue
@@ -10,10 +10,10 @@
         </div>
 
         <div id="form-content">
-            <p class="question">
+            <h2 class="question">
                 What is the commit identifier of the work?
                 <SchemaGuideLink anchor="#commit" />
-            </p>
+            </h2>
             <q-input
                 bg-color="white"
                 label="commit"
@@ -23,10 +23,10 @@
                 v-on:update:modelValue="setCommit"
             />
 
-            <p class="question">
+            <h2 class="question">
                 What is the version of the work?
                 <SchemaGuideLink anchor="#version" />
-            </p>
+            </h2>
             <q-input
                 bg-color="white"
                 label="version"
@@ -36,10 +36,10 @@
                 v-on:update:modelValue="setVersion"
             />
 
-            <p class="question">
+            <h2 class="question">
                 When was the version released?
                 <SchemaGuideLink anchor="#date-released" />
-            </p>
+            </h2>
             <q-input
                 bg-color="white"
                 hint="Format: YYYY-MM-DD"
diff --git a/src/components/Stepper.vue b/src/components/Stepper.vue
diff --git a/src/css/app.css b/src/css/app.css

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`	`1`	`{`
`2`		`- "vetur.validation.template": false,`
`3`		`- "vetur.format.enable": false,`
`4`	`2`	`"eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"],`
`5`		`- "typescript.tsdk": "node_modules/typescript/lib",`
`6`		`- "vetur.experimental.templateInterpolationService": true`
	`3`	`+ "typescript.tsdk": "node_modules/typescript/lib"`
`7`	`4`	`}`