Skip to content

fix conflict for logo_height argument by default.xml #30370

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: 2.4-develop
Choose a base branch
from
Open

fix conflict for logo_height argument by default.xml #30370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f8ae54
fix conflict for logo_height argument by default.xml
Oct 8, 2020
43ed00e
update also for blank theme
Oct 8, 2020
aa119ae
fix conflict parameter height for new versions of magento
Nov 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@

img {
display: block;
height: auto;
}

.page-print & {
Expand Down
1 change: 0 additions & 1 deletion app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@

img {
display: block;
height: auto;
}

.page-print & {
Expand Down
1 change: 0 additions & 1 deletion lib/web/css/source/lib/_resets.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove height here may cause image distorted

Copy link
Member Author

@PierW PierW Nov 23, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor

@mrtuvn mrtuvn Nov 23, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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


Expand Down