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.

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

🐛 adds in correct weight for amp-story-product-tag text #37188

Merged
merged 16 commits into from
Jan 6, 2022
Merged

🐛 adds in correct weight for amp-story-product-tag text #37188

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
887f805
adds in correct thin weight for product tag text
jshamble Dec 11, 2021
578fc18
updated to match figma spec
jshamble Dec 14, 2021
de14b0c
added in Arial as the fallback fonts
jshamble Dec 14, 2021
5f9b60d
fixed trialign whitespace
jshamble Dec 14, 2021
8728e13
fixed imporatnce and line spacing property due to RTL texts
jshamble Dec 14, 2021
e08c8cd
added internation data formatting (will be expanded upon in future it…
jshamble Dec 15, 2021
e60ff85
fix unit test
jshamble Dec 15, 2021
6b9bcdc
fix unit test
jshamble Dec 15, 2021
474cfb8
removed unnescessary spec
jshamble Dec 16, 2021
92187d0
added international formatting
jshamble Dec 16, 2021
f686f10
added in international number formatting
jshamble Dec 16, 2021
d3ceae5
added product price
jshamble Dec 20, 2021
1fd6789
added back in currency
jshamble Dec 21, 2021
b029f7d
removed fallback font
jshamble Dec 28, 2021
a80e161
merging changes
jshamble Jan 6, 2022
7310b7b
fixed lightweight text for international currency
jshamble Jan 6, 2022
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
13 changes: 12 additions & 1 deletion extensions/amp-story-shopping/0.1/amp-story-shopping-tag.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
amp-story-shopping-tag {
font-family: 'Poppins', sans-serif !important;
font-family: 'Poppins','Arial', sans-serif !important;
jshamble marked this conversation as resolved.
Show resolved Hide resolved
font-weight: 700 !important;
cursor: pointer !important;
width: auto !important;
Expand All @@ -13,6 +13,17 @@ amp-story-shopping-tag {
--i-amphtml-shopping-tag-backdrop-filter: blur(20px);
}

.amp-story-shopping-product-tag-text {
font-family: 'Poppins','Arial', sans-serif !important;
jshamble marked this conversation as resolved.
Show resolved Hide resolved
font-weight: 600 !important;
font-size: 11px !important;
line-height: 15.4px !important;
font-style: normal;
jshamble marked this conversation as resolved.
Show resolved Hide resolved
display: flex;
align-items: center;
letter-spacing: 0.01em;
jshamble marked this conversation as resolved.
Show resolved Hide resolved
}

.amp-story-shopping-tag-inner {
height: 36px !important;
display: flex !important;
Expand Down
7 changes: 6 additions & 1 deletion extensions/amp-story-shopping/0.1/amp-story-shopping-tag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@ const renderShoppingTagTemplate = (tagData) => (
}
></span>
<span class="amp-story-shopping-tag-pill-text">
{tagData['product-tag-text'] || '$' + tagData['product-price']}
{(tagData['product-tag-text'] && (
<span class="amp-story-shopping-product-tag-text">
{tagData['product-tag-text']}
</span>
)) ||
'$' + tagData['product-price']}
jshamble marked this conversation as resolved.
Show resolved Hide resolved
</span>
</span>
</div>
Expand Down