? Pending

User tests: Successful: Unsuccessful:

avatar NikitaEmberi
NikitaEmberi
21 Mar 2021

Pull Request for Issue #32190

Summary of Changes

Changes as suggested in:#32190 (comment)
and #32762 (comment)

Actual result BEFORE applying this Pull Request

image

Expected result AFTER applying this Pull Request

image

avatar NikitaEmberi NikitaEmberi - open - 21 Mar 2021
avatar NikitaEmberi NikitaEmberi - change - 21 Mar 2021
Status New Pending
avatar joomla-cms-bot joomla-cms-bot - change - 21 Mar 2021
Category Administration com_associations com_categories com_contact com_content com_fields com_modules com_newsfeeds com_users Templates (admin) NPM Change
avatar NikitaEmberi NikitaEmberi - change - 21 Mar 2021
Title
Temp#32190 3
Missing bottom border in modal
avatar NikitaEmberi NikitaEmberi - edited - 21 Mar 2021
avatar NikitaEmberi
NikitaEmberi - comment - 21 Mar 2021

Please can someone help me how to resolve conflict. I am not really understanding what is wrong.

avatar richard67
richard67 - comment - 21 Mar 2021

Please can someone help me how to resolve conflict. I am not really understanding what is wrong.

Which conflict? I don't see any conflict here. I only see code style errors reported by drone. If you follow the details you end at the log file here: https://ci.joomla.org/joomla/joomla-cms/40993/1/6 .

It mainly says you have to use tabs to indent code.

And which PR is right now? This one or #32786 ? They use different branches but are identical regarding changes. Please close one of these two. There is a button for closing it at the bottom of the PR.

avatar richard67
richard67 - comment - 21 Mar 2021

Regarding code style you could also apply the suggestions above made by @Quy .

avatar NikitaEmberi NikitaEmberi - change - 22 Mar 2021
Labels Added: NPM Resource Changed ?
avatar joomla-cms-bot joomla-cms-bot - change - 22 Mar 2021
Category Administration com_associations com_categories com_contact com_content com_fields com_modules com_newsfeeds com_users Templates (admin) NPM Change Administration com_associations com_categories com_contact com_content com_fields com_modules com_newsfeeds com_users
avatar NikitaEmberi
NikitaEmberi - comment - 22 Mar 2021

I'll resolve code style issue and open a new PR. Thank you for letting me know my mistake and I apologize for carelessly opening a PR.

avatar drmenzelit
drmenzelit - comment - 22 Mar 2021

You don't need to open a new PR, you can correct your code and make a new commit.

avatar rdeutz rdeutz - change - 22 Mar 2021
Title
Missing bottom border in modal
[4.0] Missing bottom border in modal
avatar rdeutz rdeutz - edited - 22 Mar 2021
avatar NikitaEmberi NikitaEmberi - change - 22 Mar 2021
Labels Removed: NPM Resource Changed
avatar NikitaEmberi NikitaEmberi - change - 22 Mar 2021
Status Pending Closed
Closed_Date 0000-00-00 00:00:00 2021-03-22 20:11:09
Closed_By NikitaEmberi
avatar NikitaEmberi NikitaEmberi - close - 22 Mar 2021

Add a Comment

Login with GitHub to post a comment