Skip to content

Commit 493b96d

Browse files
authored
Fix broken theme thumbnail (quick fix) (#13653)
* Fix broken theme thumbnail (quick fix) * Fix theme preview layout on large-extra large
1 parent 52598af commit 493b96d

File tree

3 files changed

+70
-37
lines changed

3 files changed

+70
-37
lines changed

src/amo/components/ThemeImage/styles.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
.ThemeImage-image {
1414
display: block;
1515
height: auto;
16-
max-width: $theme-width-default;
1716
object-fit: cover;
1817
object-position: top left;
1918
width: 100%;

src/amo/pages/Addon/index.js

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,11 @@ export class AddonBase extends React.Component {
174174
const { addon, i18n } = this.props;
175175

176176
if (addon && ADDON_TYPE_STATIC_THEME === addon.type) {
177-
return <ThemeImage addon={addon} roundedCorners />;
177+
return (
178+
<div className="Addon-theme-thumbnail">
179+
<ThemeImage addon={addon} roundedCorners />
180+
</div>
181+
);
178182
}
179183

180184
const label = addon
@@ -184,14 +188,12 @@ export class AddonBase extends React.Component {
184188
: null;
185189

186190
return (
187-
<div key="Addon-icon-header">
188-
<div className="Addon-icon-wrapper">
189-
<img
190-
alt={label}
191-
className="Addon-icon-image"
192-
src={getAddonIconUrl(addon)}
193-
/>
194-
</div>
191+
<div className="Addon-icon-wrapper">
192+
<img
193+
alt={label}
194+
className="Addon-icon-image"
195+
src={getAddonIconUrl(addon)}
196+
/>
195197
</div>
196198
);
197199
}
@@ -484,22 +486,22 @@ export class AddonBase extends React.Component {
484486
</Notice>
485487
) : null}
486488

489+
{addon && <InstallWarning addon={addon} />}
490+
{addon ? (
491+
<WrongPlatformWarning
492+
addon={addon}
493+
className="Addon-WrongPlatformWarning"
494+
/>
495+
) : null}
496+
487497
<header className="Addon-header">
488498
{this.headerImage()}
489499

490500
<div className="Addon-info">
491501
<AddonTitle addon={addon} />
492502
{showSummary ? summary : null}
493-
494-
<AddonBadges addon={addon} />
495-
{addon && <InstallWarning addon={addon} />}
496-
{addon ? (
497-
<WrongPlatformWarning
498-
addon={addon}
499-
className="Addon-WrongPlatformWarning"
500-
/>
501-
) : null}
502503
</div>
504+
<AddonBadges addon={addon} />
503505
<div className="Addon-install">
504506
<InstallButtonWrapper addon={addon} />
505507
</div>

src/amo/pages/Addon/styles.scss

Lines changed: 50 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,33 +37,66 @@
3737
}
3838
}
3939

40-
.Addon-theme .AddonTitle {
41-
margin: $padding-page-l 0;
42-
}
43-
4440
.Addon-header {
45-
display: grid;
46-
grid-template-columns: 1fr;
47-
gap: 16px;
48-
padding: 6px 0;
41+
display: flex;
42+
flex-direction: column;
43+
row-gap: 14px;
44+
45+
@include respond-to(medium) {
46+
display: grid;
47+
grid-template:
48+
'preview preview' auto
49+
'icon icon' auto
50+
'info info' auto
51+
'badges badges' auto
52+
'. button' auto / 1fr 1fr;
53+
}
4954

5055
@include respond-to(large) {
51-
grid-template-columns: 0.5fr 3fr 1fr;
56+
column-gap: 14px;
57+
grid-template:
58+
'preview preview preview preview preview' auto
59+
'icon info info button button' auto
60+
'badges badges badges badges badges' auto / min-content 1fr 1fr 1fr auto;
61+
}
62+
63+
@include respond-to(extraLarge) {
64+
grid-template:
65+
'icon info button' auto
66+
'preview preview preview' auto
67+
'badges badges badges' auto / min-content 1fr auto;
68+
}
69+
70+
@include respond-to(extraExtraLarge) {
71+
grid-template:
72+
'preview preview preview preview . button' auto
73+
'icon info info info . button' auto
74+
'badges badges badges badges badges badges' auto / min-content 1fr 1fr 1fr auto;
75+
}
76+
77+
& .Addon-theme-thumbnail {
78+
grid-area: preview;
79+
}
80+
81+
& .Addon-icon-wrapper {
82+
grid-area: icon;
5283
}
5384

5485
& .Addon-info {
55-
display: flex;
56-
flex-direction: column;
57-
gap: 8px;
86+
grid-area: info;
87+
}
88+
89+
& .AddonBadges {
90+
grid-area: badges;
5891
}
5992

6093
& .Addon-install {
61-
@include respond-to(medium) {
62-
margin-left: auto;
63-
width: 50%;
64-
}
94+
grid-area: button;
6595
@include respond-to(large) {
66-
width: 100%;
96+
min-width: 180px;
97+
}
98+
@include respond-to(extraLarge) {
99+
min-width: 200px;
67100
}
68101
}
69102
}
@@ -128,7 +161,6 @@
128161
}
129162

130163
.Addon-WrongPlatformWarning {
131-
margin: 12px 0 0;
132164
padding-left: 0;
133165
padding-right: 0;
134166
}

0 commit comments

Comments
 (0)