-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: conflict picker #1123
fix: conflict picker #1123
Conversation
@@ -425,6 +450,14 @@ export default Vue.extend({ | |||
opacity: .5; | |||
filter: saturate(.7); | |||
} | |||
|
|||
:deep(.dialog__actions) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds like a fix for NcDialog needed, there should be no need to use deep
. Probably need to make actions flex without margin.
Then you could use flex: 0 1 fit-content
on the buttons here and flex: 1 1
on the separator and no deep
styles needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, I think the NcDialogs never had a left Button in mind when designed.
Not sure this is something we cant to push forward.
So yeah, until then, I'll keep it here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes was more of "loud thinking" for future tasks of mine^^
package.json
Outdated
@@ -87,7 +88,7 @@ | |||
"simple-eta": "^3.0.2" | |||
}, | |||
"peerDependencies": { | |||
"@nextcloud/vue": "^8.0.0-beta || ^8.0.0", | |||
"@nextcloud/vue": "^8.11.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this needed for the changes? Otherwise this might introduce duplicated dependencies for using apps.
Libraries should only pin the lowest supported version, the highest compatible version is picked by NPM on install and shared with the app.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not needed no.
We can keep ^8.0.0-beta || ^8.0.0
, it doesn't matter, 8.11.0
is installed in the lockfile
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, it did matter.
I had to do this to update the nc/vue and see the latest changes on the NcDialog
. Otherwise it was weirdly not working 🤔
Now that the lockfile is updated, I can revert I guess.
But this makes updating the dep complicated (check the auto dependabot updates, it never offered @nextcloud/vue
since we changed that line)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice work!
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
0b8d38e
to
365adde
Compare
This comment was marked as resolved.
This comment was marked as resolved.
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
85f0506
to
0152903
Compare
This is correct behavior. But yes had this too in some components |
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
07d85a9
to
4a4c3f2
Compare
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
4a4c3f2
to
426015e
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewing late, but this LGTM!
Needed for nextcloud/server#44409
ConflictPicker
ConflictPicker
ConflictPicker
ConflictPicker
vue
componentsConflictPicker
mounted and throwing logic