Skip to content
This repository has been archived by the owner on Mar 12, 2020. It is now read-only.

Update palette #1215

Merged
merged 3 commits into from
Nov 21, 2018
Merged

Update palette #1215

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
3dd10c8
Update @artsy/palette to latest
javamonn Nov 5, 2018
391374c
Fix type errors
javamonn Nov 5, 2018
8b64195
Fix snapshots
javamonn Nov 20, 2018
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: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
- Adds styled LocationMap with custom pins - kieran
- Refactor auctions countdown timer, add fair countdown timer - javamonn
- Updates Show detail view styles - luc
- Updates @artsy/palette (2.21.1) - javamonn
Copy link
Member

@damassi damassi Nov 20, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Right on 👍 Thanks for bringing that PR over the line.

Copy link
Contributor

Choose a reason for hiding this comment

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

🙌

You're awesome @javamonn


### 1.7.4

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"cheerio": "0.22.0"
},
"dependencies": {
"@artsy/palette": "^2.11.0",
"@artsy/palette": "^2.21.1",
"@mapbox/react-native-mapbox-gl": "^6.1.3",
"lodash": "^4.17.4",
"moment": "^2.19.4",
Expand Down
4 changes: 2 additions & 2 deletions src/lib/Components/ArtworkGrids/Artwork.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ class Artwork extends React.Component<Props, any> {
<Badges>
{is_acquireable && (
<Badge>
<Sans fontSize={8} lineHeight={8} style={{ paddingTop: 1 }} weight="medium" size="1">
<Sans fontSize="8px" lineHeight={8} style={{ paddingTop: 1 }} weight="medium" size="1">
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Without the px hardcoding here, the values appearing in the snapshot changed dramatically from 8 to something like 72. I think this was the result of the issue described in artsy/reaction#1535.

Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm, interesting... is it only affecting the snapshot or is the line height also affected in the UI?

Copy link
Member

Choose a reason for hiding this comment

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

I think this is related to @mzikherman updating the badges to include an item that was outside of Palette's theme file, per @briansw's request.

Copy link
Contributor Author

@javamonn javamonn Nov 20, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

It affects both:

Before fixing px:
screen shot 2018-11-20 at 2 18 08 pm

After:
screen shot 2018-11-20 at 2 19 00 pm

My understanding of the issue is that it only affects spots where we're passing values into fontSize and lineHeight overrides like this, though this makes me concerned about us potentially doing this in spots we don't cover with snapshot tests - I'll see if I can find any other affected spots with a search.

Edit: this appears to be the only spot we do this kind of override in Emission.

Copy link
Member

@damassi damassi Nov 20, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

@javamonn - would you mind raising this in #front-end so that others don't get tripped up accidentally?

BUY NOW
</Sans>
</Badge>
)}
{is_biddable && (
<Badge>
<Sans fontSize={8} lineHeight={8} style={{ paddingTop: 1 }} weight="medium" size="1">
<Sans fontSize="8px" lineHeight={8} style={{ paddingTop: 1 }} weight="medium" size="1">
BID
</Sans>
</Badge>
Expand Down
60 changes: 30 additions & 30 deletions src/lib/Components/ArtworkGrids/__tests__/__snapshots__/Artwork-tests.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ exports[`in a closed sale renders bid when an auction is about to open, but not
className="sc-bdVaJa bDWFJH"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={8}
fontSize="8px"
lineHeight={8}
style={
Array [
Expand Down Expand Up @@ -96,7 +96,7 @@ exports[`in a closed sale renders bid when an auction is about to open, but not
className="sc-bdVaJa bDWFJH"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={8}
fontSize="8px"
lineHeight={8}
style={
Array [
Expand Down Expand Up @@ -137,8 +137,8 @@ exports[`in a closed sale renders bid when an auction is about to open, but not
color="#000"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand All @@ -161,8 +161,8 @@ exports[`in a closed sale renders bid when an auction is about to open, but not
color="#666"
ellipsizeMode="tail"
fontFamily="Unica77LL-Regular"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand Down Expand Up @@ -335,7 +335,7 @@ exports[`in a closed sale renders without any price information 1`] = `
className="sc-bdVaJa bDWFJH"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={8}
fontSize="8px"
lineHeight={8}
style={
Array [
Expand Down Expand Up @@ -375,7 +375,7 @@ exports[`in a closed sale renders without any price information 1`] = `
className="sc-bdVaJa bDWFJH"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={8}
fontSize="8px"
lineHeight={8}
style={
Array [
Expand Down Expand Up @@ -416,8 +416,8 @@ exports[`in a closed sale renders without any price information 1`] = `
color="#000"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand All @@ -440,8 +440,8 @@ exports[`in a closed sale renders without any price information 1`] = `
color="#666"
ellipsizeMode="tail"
fontFamily="Unica77LL-Regular"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand Down Expand Up @@ -614,7 +614,7 @@ exports[`in an open sale renders with current bid 1`] = `
className="sc-bdVaJa bDWFJH"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={8}
fontSize="8px"
lineHeight={8}
style={
Array [
Expand Down Expand Up @@ -654,7 +654,7 @@ exports[`in an open sale renders with current bid 1`] = `
className="sc-bdVaJa bDWFJH"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={8}
fontSize="8px"
lineHeight={8}
style={
Array [
Expand Down Expand Up @@ -695,8 +695,8 @@ exports[`in an open sale renders with current bid 1`] = `
color="#000"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand All @@ -719,8 +719,8 @@ exports[`in an open sale renders with current bid 1`] = `
color="#666"
ellipsizeMode="tail"
fontFamily="Unica77LL-Regular"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand Down Expand Up @@ -893,7 +893,7 @@ exports[`in an open sale renders with starting bid 1`] = `
className="sc-bdVaJa bDWFJH"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={8}
fontSize="8px"
lineHeight={8}
style={
Array [
Expand Down Expand Up @@ -933,7 +933,7 @@ exports[`in an open sale renders with starting bid 1`] = `
className="sc-bdVaJa bDWFJH"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={8}
fontSize="8px"
lineHeight={8}
style={
Array [
Expand Down Expand Up @@ -974,8 +974,8 @@ exports[`in an open sale renders with starting bid 1`] = `
color="#000"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand All @@ -997,8 +997,8 @@ exports[`in an open sale renders with starting bid 1`] = `
color="#666"
ellipsizeMode="tail"
fontFamily="Unica77LL-Regular"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand Down Expand Up @@ -1171,7 +1171,7 @@ exports[`renders properly 1`] = `
className="sc-bdVaJa bDWFJH"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={8}
fontSize="8px"
lineHeight={8}
style={
Array [
Expand Down Expand Up @@ -1211,7 +1211,7 @@ exports[`renders properly 1`] = `
className="sc-bdVaJa bDWFJH"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={8}
fontSize="8px"
lineHeight={8}
style={
Array [
Expand Down Expand Up @@ -1252,8 +1252,8 @@ exports[`renders properly 1`] = `
color="#000"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand All @@ -1276,8 +1276,8 @@ exports[`renders properly 1`] = `
color="#666"
ellipsizeMode="tail"
fontFamily="Unica77LL-Regular"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand Down
24 changes: 12 additions & 12 deletions src/lib/Components/ArtworkGrids/__tests__/__snapshots__/Generic-grid-tests.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ exports[`renders properly 1`] = `
color="#000"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand All @@ -90,8 +90,8 @@ exports[`renders properly 1`] = `
color="#666"
ellipsizeMode="tail"
fontFamily="Unica77LL-Regular"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand Down Expand Up @@ -260,8 +260,8 @@ exports[`renders properly 1`] = `
color="#000"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand All @@ -283,8 +283,8 @@ exports[`renders properly 1`] = `
color="#666"
ellipsizeMode="tail"
fontFamily="Unica77LL-Regular"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand Down Expand Up @@ -453,8 +453,8 @@ exports[`renders properly 1`] = `
color="#000"
ellipsizeMode="tail"
fontFamily="Unica77LL-Medium"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand All @@ -476,8 +476,8 @@ exports[`renders properly 1`] = `
color="#666"
ellipsizeMode="tail"
fontFamily="Unica77LL-Regular"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
style={
Array [
Object {
Expand Down
24 changes: 12 additions & 12 deletions src/lib/Components/Bidding/Components/__tests__/__snapshots__/PaymentInfo-tests.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ exports[`renders properly 1`] = `
className="sc-bwzfXH uTxCW"
ellipsizeMode="tail"
fontFamily="AGaramondPro-Semibold"
fontSize={16}
lineHeight={24}
fontSize="16px"
lineHeight="24px"
style={
Array [
Object {
Expand Down Expand Up @@ -101,8 +101,8 @@ exports[`renders properly 1`] = `
className="sc-bwzfXH uTxCW"
ellipsizeMode="tail"
fontFamily="AGaramondPro-Regular"
fontSize={16}
lineHeight={24}
fontSize="16px"
lineHeight="24px"
numberOfLines={1}
style={
Array [
Expand Down Expand Up @@ -138,8 +138,8 @@ exports[`renders properly 1`] = `
color="purple100"
ellipsizeMode="tail"
fontFamily="Unica77LL-Regular"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
mb={1}
ml={3}
style={
Expand Down Expand Up @@ -223,8 +223,8 @@ exports[`renders properly 1`] = `
className="sc-bwzfXH uTxCW"
ellipsizeMode="tail"
fontFamily="AGaramondPro-Semibold"
fontSize={16}
lineHeight={24}
fontSize="16px"
lineHeight="24px"
style={
Array [
Object {
Expand Down Expand Up @@ -259,8 +259,8 @@ exports[`renders properly 1`] = `
className="sc-bwzfXH uTxCW"
ellipsizeMode="tail"
fontFamily="AGaramondPro-Regular"
fontSize={16}
lineHeight={24}
fontSize="16px"
lineHeight="24px"
numberOfLines={1}
style={
Array [
Expand Down Expand Up @@ -296,8 +296,8 @@ exports[`renders properly 1`] = `
color="purple100"
ellipsizeMode="tail"
fontFamily="Unica77LL-Regular"
fontSize={12}
lineHeight={16}
fontSize="12px"
lineHeight="16px"
mb={1}
ml={3}
style={
Expand Down
4 changes: 2 additions & 2 deletions src/lib/Components/Bidding/Components/__tests__/__snapshots__/Title-tests.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ exports[`renders properly 1`] = `
className="sc-bwzfXH uTxCW"
ellipsizeMode="tail"
fontFamily="AGaramondPro-Semibold"
fontSize={22}
lineHeight={28}
fontSize="22px"
lineHeight="28px"
m={4}
style={
Array [
Expand Down
Loading