From a7711b231c1da90a780c55399a6f9445eb62d669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matuzale=CC=81m=20S=2E=20Teles?= Date: Wed, 24 Jan 2018 19:00:57 -0300 Subject: [PATCH 1/3] Fix icon markup on ClayHorizontalCard | Fixes #462 --- packages/clay-card/src/ClayHorizontalCard.soy | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/clay-card/src/ClayHorizontalCard.soy b/packages/clay-card/src/ClayHorizontalCard.soy index 6f1f6d121b..99ebc1e369 100644 --- a/packages/clay-card/src/ClayHorizontalCard.soy +++ b/packages/clay-card/src/ClayHorizontalCard.soy @@ -93,11 +93,13 @@ autofit-col autofit-col-expand autofit-col-gutters {/let} - {call ClaySticker.render} - {param icon: $icon ?: 'folder' /} - {param spritemap: $spritemap /} - {param style: 'unstyled' /} - {/call} +
+ {call ClaySticker.render} + {param icon: $icon ?: 'folder' /} + {param spritemap: $spritemap /} + {param style: 'unstyled' /} + {/call} +
{if $href} From bd8e9d650206f55ad01cf07e409154fbebcc7fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matuzale=CC=81m=20S=2E=20Teles?= Date: Wed, 24 Jan 2018 19:04:58 -0300 Subject: [PATCH 2/3] Regen snapshots | Fixes #462 --- .../__snapshots__/ClayCardGrid.js.snap | 32 ++-- .../__snapshots__/ClayHorizontalCard.js.snap | 176 ++++++++++-------- .../__snapshots__/ClayDatasetDisplay.js.snap | 32 ++-- 3 files changed, 135 insertions(+), 105 deletions(-) diff --git a/packages/clay-card-grid/src/__tests__/__snapshots__/ClayCardGrid.js.snap b/packages/clay-card-grid/src/__tests__/__snapshots__/ClayCardGrid.js.snap index 2c28631318..9518a5c31a 100644 --- a/packages/clay-card-grid/src/__tests__/__snapshots__/ClayCardGrid.js.snap +++ b/packages/clay-card-grid/src/__tests__/__snapshots__/ClayCardGrid.js.snap @@ -12,14 +12,16 @@ exports[`ClayCardGrid should render the default markup 1`] = `
- - - +
+ + + + - +
Photos
@@ -31,14 +33,16 @@ exports[`ClayCardGrid should render the default markup 1`] = `
- - - +
+ + + + - +
Videos
diff --git a/packages/clay-card/src/__tests__/__snapshots__/ClayHorizontalCard.js.snap b/packages/clay-card/src/__tests__/__snapshots__/ClayHorizontalCard.js.snap index 8cc7614f4f..fd05955cf5 100644 --- a/packages/clay-card/src/__tests__/__snapshots__/ClayHorizontalCard.js.snap +++ b/packages/clay-card/src/__tests__/__snapshots__/ClayHorizontalCard.js.snap @@ -4,14 +4,16 @@ exports[`ClayHorizontalCard should render a ClayHorizontalCard with a different
- - - +
+ + + + - +
My Title
@@ -24,14 +26,16 @@ exports[`ClayHorizontalCard should render a ClayHorizontalCard with actionItems
- - - +
+ + + + - +
My Title
@@ -64,14 +68,16 @@ exports[`ClayHorizontalCard should render a ClayHorizontalCard with classes 1`]
- - - +
+ + + + - +
My Title
@@ -84,14 +90,16 @@ exports[`ClayHorizontalCard should render a ClayHorizontalCard with href 1`] = `
- - - +
+ + + + - +
My Title
@@ -104,14 +112,16 @@ exports[`ClayHorizontalCard should render a ClayHorizontalCard with id 1`] = `
- - - +
+ + + + - +
My Title
@@ -131,14 +141,16 @@ exports[`ClayHorizontalCard should render a disabled ClayHorizontalCard 1`] = `
- - - +
+ + + + - +
My Title
@@ -161,14 +173,16 @@ exports[`ClayHorizontalCard should render a selectable ClayHorizontalCard 1`] =
- - - +
+ + + + - +
My Title
@@ -191,14 +205,16 @@ exports[`ClayHorizontalCard should render a selectable ClayHorizontalCard with i
- - - +
+ + + + - +
My Title
@@ -221,14 +237,16 @@ exports[`ClayHorizontalCard should render a selectable ClayHorizontalCard with i
- - - +
+ + + + - +
My Title
@@ -251,14 +269,16 @@ exports[`ClayHorizontalCard should render a selected ClayHorizontalCard 1`] = `
- - - +
+ + + + - +
My Title
@@ -274,14 +294,16 @@ exports[`ClayHorizontalCard should render the default markup 1`] = `
- - - +
+ + + + - +
My Title
diff --git a/packages/clay-dataset-display/src/__tests__/__snapshots__/ClayDatasetDisplay.js.snap b/packages/clay-dataset-display/src/__tests__/__snapshots__/ClayDatasetDisplay.js.snap index ca95e5c879..36ef3a113b 100644 --- a/packages/clay-dataset-display/src/__tests__/__snapshots__/ClayDatasetDisplay.js.snap +++ b/packages/clay-dataset-display/src/__tests__/__snapshots__/ClayDatasetDisplay.js.snap @@ -2815,14 +2815,16 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li
- - - +
+ + + + - +
Photos
@@ -2854,14 +2856,16 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li
- - - +
+ + + + - +
Videos
From 5a0773f51ecb4fb9aebf839570172034c5bd55ab Mon Sep 17 00:00:00 2001 From: Carlos Lancha Date: Wed, 24 Jan 2018 16:41:11 -0800 Subject: [PATCH 3/3] SF | Fixes #462 --- packages/clay-card/src/ClayHorizontalCard.soy | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/clay-card/src/ClayHorizontalCard.soy b/packages/clay-card/src/ClayHorizontalCard.soy index 99ebc1e369..bbadb74a07 100644 --- a/packages/clay-card/src/ClayHorizontalCard.soy +++ b/packages/clay-card/src/ClayHorizontalCard.soy @@ -89,10 +89,6 @@
- {let $classesDescription kind="text"} - autofit-col autofit-col-expand autofit-col-gutters - {/let} -
{call ClaySticker.render} {param icon: $icon ?: 'folder' /} @@ -101,7 +97,7 @@ {/call}
-
+
{if $href} {call ClayLink.render} {param elementClasses: 'card-title text-truncate' /}