Skip to content

Commit

Permalink
fix duplicate attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
devincowan committed May 24, 2023
1 parent 3ba7522 commit e1be626
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = {
'eslint:recommended',
'@vue/eslint-config-typescript',
'@vue/eslint-config-prettier/skip-formatting',
"plugin:vuetify/base"
'plugin:vuetify/base'
],
overrides: [
{
Expand Down
8 changes: 3 additions & 5 deletions TODO
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
TODO
npx eslint --ext .vue src
https://vuetifyjs.com/en/getting-started/upgrade-guide/
vuex orm -> pinia
replace vue-facing-decorator -> composables
re-enable sprintf
fontawesome
browserDetect
enable routerGuards

https://vuetifyjs.com/en/getting-started/upgrade-guide/
v-list-item-group has been removed, just add value to list items to make them selectable and bind
v-list-item-content has been removed, lists use CSS grid for layout now instead.
enable routerGuards
25 changes: 24 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"rxjs": "^7.5.5",
"sprintf-js": "^1.1.2",
"v-mask": "^2.3.0",
"vite-plugin-vuetify": "^1.0.2",
"vue": "^3.3.2",
"vue-browser-detect-plugin": "^0.1.18",
"vue-cookies": "^1.8.1",
Expand All @@ -57,8 +56,9 @@
"eslint": "^8.39.0",
"eslint-plugin-cypress": "^2.13.3",
"eslint-plugin-vue": "^9.11.0",
"npm-run-all": "^4.1.5",
"eslint-plugin-vuetify": "^2.0.1",
"node-sass": "*",
"npm-run-all": "^4.1.5",
"prettier": "^2.8.8",
"sass": "^1.51.0",
"sass-loader": "^10.2.1",
Expand Down
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
>Log In</v-btn
>
<template v-else>
<v-menu location="bottom" location="left">
<v-menu location="bottom left">
<template v-slot:activator="{ on, attrs }">
<v-btn
:color="
Expand Down
5 changes: 2 additions & 3 deletions src/components/new-submission/cz.folder-structure.vue
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
v-if="showFileWarnings(item)"
class="d-flex flex-grow-0 flex-shrink-0 ma-3 ml-2 pa-0 text-caption text--secondary align-center"
>
<v-menu open-on-hover location="bottom" location="left" offset-y>
<v-menu open-on-hover location="bottom left" offset-y>
<template v-slot:activator="{ on, attrs }">
<div v-bind="attrs" v-on="on">
<v-icon
Expand Down Expand Up @@ -368,8 +368,7 @@
<v-menu
v-if="isTotalUploadSizeTooBig"
open-on-hover
location="top"
location="right"
location="top right"
offset-y
>
<template v-slot:activator="{ on, attrs }">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
class="submission-cancel my-2 my-sm-0"
>{{ isPublished ? "Back" : "Cancel" }}</v-btn
>
<v-menu :disabled="!errors.length" open-on-hover location="bottom" location="left" offset-y>
<v-menu :disabled="!errors.length" open-on-hover location="bottom left" offset-y>
<template v-slot:activator="{ on, attrs }">
<div
v-bind="attrs"
Expand Down

0 comments on commit e1be626

Please sign in to comment.