fix conflict for logo_height argument by default.xml #30370

PierW · 2020-10-08T08:39:53Z

Description (*)

For a new theme, for example child of luma, if you want change the logo by default.xml and set also his size by the height, you should write this:

<referenceBlock name="logo"> <arguments> <argument name="logo_file" xsi:type="string">images/logo.png</argument> <argument name="logo_height" xsi:type="number">300</argument> </arguments> </referenceBlock>

Now the problem is that it doesn't works, because there is a conflict with the line 151 of _module.less:

The result is that our rule is overwritten:

It doesn't happen with Width.
Sometime we want set the image by height and not by the width... or maybe with both... why not? It's your choice.
So for now the logo_height have no sense to exist.

The height: auto should be deleted and all will work fine.

Related Pull Requests

Fixed Issues (if relevant)

Manual testing scenarios (*)

Magento 2.4-develop
Create a new theme child of Luma

Create the default.xml and copy this:

 <referenceBlock name="logo">
  <arguments>
         <argument name="logo_file" xsi:type="string">images/logo.png</argument>
         <argument name="logo_height" xsi:type="number">300</argument>
   </arguments>
 </referenceBlock>

Put your custom logo.png inside the images folder.
Save and delete the cache
Refresh the page

Questions or comments

Contribution checklist (*)

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
All automated tests passed successfully (all builds are green)

Resolved issues:

resolves [Issue] fix conflict for logo_height argument by default.xml #30377: fix conflict for logo_height argument by default.xml

m2-assistant · 2020-10-08T08:39:56Z

Hi @PierW. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

@magento give me test instance - deploy test instance based on PR changes
@magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

@magento run all tests - run or re-run all required tests against the PR changes
@magento run <test-build(s)> - run or re-run specific test build(s)
For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

Database Compare
Functional Tests CE
Functional Tests EE,
Functional Tests B2B
Integration Tests
Magento Health Index
Sample Data Tests CE
Sample Data Tests EE
Sample Data Tests B2B
Static Tests
Unit Tests
WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

PierW · 2020-10-08T09:41:53Z

@magento run all tests

sidolov · 2020-10-08T14:40:48Z

@magento create issue

mrtuvn · 2020-10-08T14:59:09Z

@PierW Can you update for blank theme ?
I found same file in blank theme have same declare
see this https://github.com/magento/magento2/blob/2.4-develop/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less#L94
IMO this declare in theme less file is unneccesary. Default magento already set height auto we don't have to re-declare height for image

PierW · 2020-10-08T15:17:48Z

@PierW Can you update for blank theme ?
I found same file in blank theme have same declare
see this https://github.com/magento/magento2/blob/2.4-develop/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less#L94
IMO this declare in theme less file is unneccesary. Default magento already set height auto we don't have to re-declare height for image

@mrtuvn Done, thanks :)

mrtuvn · 2020-10-08T15:23:53Z

Ok seem everything ok with me
@krzksz can you give this PR some review! Thanks

PierW · 2020-10-09T10:27:47Z

@magento run all tests

ptylek

Looks good to me. Broken functional tests seem not related to this PR.

magento-engcom-team · 2020-10-12T19:27:41Z

Hi @ptylek, thank you for the review.
ENGCOM-8331 has been created to process this Pull Request
✳️ @ptylek, could you please add one of the following labels to the Pull Request?

Label	Description
`Auto-Tests: Covered`	All changes in Pull Request is covered by auto-tests
`Auto-Tests: Not Covered`	Changes in Pull Request requires coverage by auto-tests
`Auto-Tests: Not Required`	Changes in Pull Request does not require coverage by auto-tests

engcom-Alfa

Hi @PierW.
Looks like the changes don't solve the issue.

Manual testing scenario:

Magento 2.4-develop
Create a new theme child of Luma

Create the default.xml and copy this:

 <referenceBlock name="logo">
  <arguments>
         <argument name="logo_file" xsi:type="string">images/logo.png</argument>
         <argument name="logo_height" xsi:type="number">300</argument>
   </arguments>
 </referenceBlock>

Put your custom logo.png inside the images folder.
Save and delete the cache
Refresh the page

Actual Result: ✖️ The logo image is still with the same parameters

@PierW Maybe we missed something?
Could you take a look?
Thanks!

Pull Request state was updated. Re-review required.

PierW · 2020-10-21T18:12:00Z

images/logo.png 300

@engcom-Alfa Could you try to do that in developer mode? So we will check better why and where do you have the image{ height: auto} in style-m.less, I'm sure, now I tried again. With Luma and Blank theme do you have just:
.logo .img{} selector on line 94 and 151 of _module.less. I checked also on Magento 2.3.5 now.

PierW · 2020-11-23T10:14:19Z

@engcom-Alfa fixed! It was the line 50 (Height: auto) of _resets.less file on version 2.4 of magento.
Now for me it's ok.

mrtuvn · 2020-11-23T15:04:24Z

lib/web/css/source/lib/_resets.less

@@ -49,7 +49,6 @@

    img {
        max-width: 100%;
-        height: auto;
        border: 0;
    }


Remove height here may cause image distorted

So why is there methods 'logo_height' inside the block if we can't use that?
If you don't put that in _resets.less... and you don't set an height, it will be "auto" for default.

i'm ok with height auto in file reset. Only need remove redundant code in folder theme when you already have set default in reset file

I would use both define width height attribute image html and also use height auto in css. Note you also able to set width height of logo in config from backend

mrtuvn · 2020-11-23T20:26:06Z

#29721
Your PR fix may improve for this

fix conflict for logo_height argument by default.xml

9f8ae54

ghost added the Progress: pending review label Oct 8, 2020

magento-engcom-team added Area: Design/Frontend Release Line: 2.4 labels Oct 8, 2020

orlangur self-assigned this Oct 8, 2020

sidolov added Priority: P4 No current plan to fix. Fixing can be deferred as a logical part of more important work. Severity: S4 Affects aesthetics, professional look and feel, “quality” or “usability”. labels Oct 8, 2020

m2-assistant bot mentioned this pull request Oct 8, 2020

[Issue] fix conflict for logo_height argument by default.xml #30377

Open

4 tasks

update also for blank theme

43ed00e

ptylek previously approved these changes Oct 12, 2020

View reviewed changes

ghost assigned ptylek Oct 12, 2020

ghost added Progress: ready for testing and removed Progress: pending review labels Oct 12, 2020

ptylek added the Auto-Tests: Not Required Changes in Pull Request does not require coverage by auto-tests label Oct 12, 2020

engcom-Alfa self-assigned this Oct 19, 2020

ghost added Progress: testing in progress and removed Progress: ready for testing labels Oct 19, 2020

engcom-Alfa requested changes Oct 20, 2020

View reviewed changes

ghost added Progress: needs update and removed Progress: testing in progress labels Oct 20, 2020

fix conflict parameter height for new versions of magento

aa119ae

mrtuvn requested changes Nov 23, 2020

View reviewed changes

m2-community-project bot assigned mrtuvn Nov 23, 2020

m2-community-project bot added Progress: review and removed Progress: needs update labels Nov 23, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix conflict for logo_height argument by default.xml #30370

fix conflict for logo_height argument by default.xml #30370

PierW commented Oct 8, 2020 •

edited by m2-assistant bot

Loading

m2-assistant bot commented Oct 8, 2020

PierW commented Oct 8, 2020

sidolov commented Oct 8, 2020

mrtuvn commented Oct 8, 2020 •

edited

Loading

PierW commented Oct 8, 2020

mrtuvn commented Oct 8, 2020

PierW commented Oct 9, 2020

ptylek left a comment •

edited

Loading

magento-engcom-team commented Oct 12, 2020

engcom-Alfa left a comment

PierW commented Oct 21, 2020 •

edited

Loading

PierW commented Nov 23, 2020

mrtuvn Nov 23, 2020

PierW Nov 23, 2020 •

edited

Loading

mrtuvn Nov 23, 2020

mrtuvn Nov 23, 2020 •

edited

Loading

mrtuvn commented Nov 23, 2020

fix conflict for logo_height argument by default.xml #30370

Are you sure you want to change the base?

fix conflict for logo_height argument by default.xml #30370

Conversation

PierW commented Oct 8, 2020 • edited by m2-assistant bot Loading

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

Manual testing scenarios (*)

Questions or comments

Contribution checklist (*)

Resolved issues:

m2-assistant bot commented Oct 8, 2020

PierW commented Oct 8, 2020

sidolov commented Oct 8, 2020

mrtuvn commented Oct 8, 2020 • edited Loading

PierW commented Oct 8, 2020

mrtuvn commented Oct 8, 2020

PierW commented Oct 9, 2020

ptylek left a comment • edited Loading

Choose a reason for hiding this comment

magento-engcom-team commented Oct 12, 2020

engcom-Alfa left a comment

Choose a reason for hiding this comment

PierW commented Oct 21, 2020 • edited Loading

PierW commented Nov 23, 2020

mrtuvn Nov 23, 2020

Choose a reason for hiding this comment

PierW Nov 23, 2020 • edited Loading

Choose a reason for hiding this comment

mrtuvn Nov 23, 2020

Choose a reason for hiding this comment

mrtuvn Nov 23, 2020 • edited Loading

Choose a reason for hiding this comment

mrtuvn commented Nov 23, 2020

PierW commented Oct 8, 2020 •

edited by m2-assistant bot

Loading

mrtuvn commented Oct 8, 2020 •

edited

Loading

ptylek left a comment •

edited

Loading

PierW commented Oct 21, 2020 •

edited

Loading

PierW Nov 23, 2020 •

edited

Loading

mrtuvn Nov 23, 2020 •

edited

Loading