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

Fixed broken boxes.css in OM 20.0.15 #2364

Merged
merged 9 commits into from
Aug 9, 2022
Merged

Fixed broken boxes.css in OM 20.0.15 #2364

merged 9 commits into from
Aug 9, 2022

Conversation

fballiano
Copy link
Contributor

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.

@github-actions github-actions bot added Component: Adminhtml Relates to Mage_Adminhtml Template : admin Relates to admin template labels Aug 4, 2022
@fballiano fballiano changed the title Fix 20 0 15 Fixed broken boxes.css in OM 20.0.15 Aug 4, 2022
@addison74
Copy link
Contributor

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.

@fballiano
Copy link
Contributor Author

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.

@fballiano fballiano merged commit 645a959 into OpenMage:20.0 Aug 9, 2022
@fballiano fballiano deleted the fix_20_0_15 branch August 9, 2022 20:30
@github-actions
Copy link
Contributor

github-actions bot commented Aug 9, 2022

Unit Test Results

1 files  ±0  1 suites  ±0   0s ⏱️ ±0s
0 tests ±0  0 ✔️ ±0  0 💤 ±0  0 ❌ ±0 
7 runs  ±0  7 ✔️ ±0  0 💤 ±0  0 ❌ ±0 

Results for commit 645a959. ± Comparison against base commit cf82b8f.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Adminhtml Relates to Mage_Adminhtml Template : admin Relates to admin template
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants