-
-
Notifications
You must be signed in to change notification settings - Fork 436
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
Fixed broken boxes.css in OM 20.0.15 #2364
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Component: Adminhtml
Relates to Mage_Adminhtml
Template : admin
Relates to admin template
labels
Aug 4, 2022
Sorry for commenting on your PR. Lines 573 - 574 reintroduce an issue that was solved by PR #2254. Thus lines 573 - 576 of the initial boxes.css file must be left unchanged. I would recommend a thorough check of all the changes made in this file to avoid new issues. |
I was about to push this last commit from #2254 😅 and I don't see any reason to be sorry to comment on any PR. |
Sdfendor
reviewed
Aug 4, 2022
fballiano
requested review from
luigifab,
addison74,
elidrissidev,
Flyingmana,
kiatng and
sreichel
August 9, 2022 10:02
kiatng
approved these changes
Aug 9, 2022
addison74
approved these changes
Aug 9, 2022
tmewes
approved these changes
Aug 9, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In #2206 I messed up skin/adminhtml/default/default/boxes.css (probably because of the many PRs that were modifying this same file, with conflicts) and the 20.0.15 release contains a broken version of that file.
I've manually rechecked all the commits in https://github.com/OpenMage/magento-lts/pull/2206/commits, cherry picked each one of them and it seems that the only file that was broken was the boxes.css
I've remerged all those commits and it should be fine now.
It would be better to merge #2363 first so that I can add the new version number to this PR and be ready to re-release.