Skip to content
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

Add inline-flex to wire:loading #4246

Merged
merged 4 commits into from
Dec 8, 2021

Conversation

Francismori7
Copy link
Contributor

When you are trying to inline-flex a loading element, just like for instance you want to center the loading message inside a table's td, you need it to be inline-flex.

@joshhanley
Copy link
Member

@Francismori7 thanks for the PR! It seems like there is a failure in one of your tests

image

@Francismori7
Copy link
Contributor Author

@Francismori7 thanks for the PR! It seems like there is a failure in one of your tests

image

Can you run it again? The javascript wasn't built. I did now.

@joshhanley
Copy link
Member

@Francismori7 ah yep, I'll start them now!

@calebporzio
Copy link
Collaborator

If the tests are passing the conflicts have been resolved, I'll merge this - sorry for the extra work on such a simple addition. Thanks @Francismori7! and thanks @joshhanley for helping out here

@Francismori7
Copy link
Contributor Author

If the tests are passing the conflicts have been resolved, I'll merge this - sorry for the extra work on such a simple addition. Thanks @Francismori7! and thanks @joshhanley for helping out here

The merge conflicts are due to the compiled files, how can I resolve them?

@joshhanley
Copy link
Member

@Francismori7 best thing to do would just be to merge the latest commits on the master branch into your feature branch, and then rebuild assets again and do another commit of the assets.

@Francismori7
Copy link
Contributor Author

All done!

@calebporzio calebporzio merged commit 556318c into livewire:master Dec 8, 2021
@calebporzio
Copy link
Collaborator

Thanks @Francismori7! Can you add a bit about this support to the livewire/docs? Thanks!

@Francismori7
Copy link
Contributor Author

Thanks @Francismori7! Can you add a bit about this support to the livewire/docs? Thanks!

Sure thing.

@Francismori7 Francismori7 deleted the loading-inline-flex branch December 8, 2021 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants