Skip to content

Commit 9abcf54

Browse files
committed
#25042 Remove logo dimension parameters from layout files for blank and luma theme
1 parent c7ca62e commit 9abcf54

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

app/code/Magento/Theme/Block/Html/Header/Logo.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function getLogoWidth()
9898
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
9999
);
100100
}
101-
return (int)$this->_data['logo_width'] ? : (int)$this->getLogoImgWidth();
101+
return (int)$this->_data['logo_width'];
102102
}
103103

104104
/**
@@ -114,7 +114,7 @@ public function getLogoHeight()
114114
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
115115
);
116116
}
117-
return (int)$this->_data['logo_height'] ? : (int)$this->getLogoImgHeight();
117+
return (int)$this->_data['logo_height'];
118118
}
119119

120120
/**

app/code/Magento/Theme/view/frontend/layout/default.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,7 @@
5050
</container>
5151
</container>
5252
<container name="header-wrapper" label="Page Header" as="header-wrapper" htmlTag="div" htmlClass="header content">
53-
<block class="Magento\Theme\Block\Html\Header\Logo" name="logo">
54-
<arguments>
55-
<argument name="logo_img_width" xsi:type="number">189</argument>
56-
<argument name="logo_img_height" xsi:type="number">64</argument>
57-
</arguments>
58-
</block>
53+
<block class="Magento\Theme\Block\Html\Header\Logo" name="logo"/>
5954
</container>
6055
</referenceContainer>
6156
<referenceContainer name="page.top">

app/design/frontend/Magento/luma/Magento_Theme/layout/default.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@
1414
</arguments>
1515
</block>
1616
</referenceContainer>
17-
<referenceBlock name="logo">
18-
<arguments>
19-
<argument name="logo_img_width" xsi:type="number">148</argument>
20-
<argument name="logo_img_height" xsi:type="number">43</argument>
21-
</arguments>
22-
</referenceBlock>
2317
<referenceContainer name="footer">
2418
<block class="Magento\Store\Block\Switcher" name="store_switcher" as="store_switcher" after="footer_links" template="Magento_Store::switch/stores.phtml"/>
2519
</referenceContainer>

0 commit comments

Comments
 (0)