Merge pull request #533 from carloslancha/UpdateMetaltoolssoy

Update metal-tools-soy to 6.0.0 | Fixes #530
liferay · Feb 8, 2018 · ea50dd9 · ea50dd9
2 parents 6682e21 + 34a85af
commit ea50dd9
Show file tree

Hide file tree

Showing 40 changed files with 2,559 additions and 2,456 deletions.
diff --git a/packages/clay-alert/package.json b/packages/clay-alert/package.json
@@ -43,7 +43,7 @@
     "babel-preset-env": "^1.6.0",
     "browserslist-config-clay-components": "^1.0.0-alpha.2",
     "clay": "^2.0.0-rc.0",
-    "metal-tools-soy": "^5.0.0",
+    "metal-tools-soy": "^6.0.0",
     "webpack": "^3.0.0"
   },
   "browserslist": [

diff --git a/packages/clay-badge/package.json b/packages/clay-badge/package.json
@@ -42,7 +42,7 @@
     "browserslist-config-clay-components": "^1.0.0-alpha.2",
     "clay": "^2.0.0-rc.0",
     "metal-dom": "^2.13.2",
-    "metal-tools-soy": "^5.0.0",
+    "metal-tools-soy": "^6.0.0",
     "webpack": "^3.0.0"
   },
   "browserslist": [

diff --git a/packages/clay-button/package.json b/packages/clay-button/package.json
@@ -43,7 +43,7 @@
     "babel-preset-env": "^1.6.0",
     "browserslist-config-clay-components": "^1.0.0-alpha.2",
     "clay": "^2.0.0-rc.0",
-    "metal-tools-soy": "^5.0.0",
+    "metal-tools-soy": "^6.0.0",
     "webpack": "^3.0.0"
   },
   "browserslist": [

diff --git a/packages/clay-card-grid/package.json b/packages/clay-card-grid/package.json
@@ -43,7 +43,7 @@
     "browserslist-config-clay-components": "^1.0.0-alpha.2",
     "clay": "^2.0.0-rc.0",
     "metal-dom": "^2.13.2",
-    "metal-tools-soy": "^5.0.0",
+    "metal-tools-soy": "^6.0.0",
     "webpack": "^3.0.0"
   },
   "browserslist": [

diff --git a/packages/clay-card-grid/src/ClayCardGrid.soy b/packages/clay-card-grid/src/ClayCardGrid.soy
@@ -26,17 +26,20 @@
 	{@param? spritemap: string}
 
 	{let $attributes kind="attributes"}
-		{if $elementClasses}
-			class="{$elementClasses}"
-		{/if}
+		class="card-page
+			{if $elementClasses}
+				{sp}{$elementClasses}
+			{/if}
+		"
 
 		{if $id}
 			id="{$id}"
 		{/if}
 	{/let}
 
-	<div {$attributes}>
+	<ul {$attributes}>
 		{if $items and $spritemap}
+
 			{call .items}
 				{param handleItemToggled_: $handleItemToggled_ /}
 				{param items: $items /}
@@ -45,7 +48,7 @@
 				{param spritemap: $spritemap /}
 			{/call}
 		{/if}
-	</div>
+	</ul>
 {/template}
 
 /**
@@ -140,7 +143,9 @@
 				id="group-{$currentgroupName}"
 			{/let}
 
-			<h4 {$headerAttributes}>{$item.label}</h4>
+			<li>
+				<h4 {$headerAttributes}>{$item.label}</h4>
+			</li>
 
 			{call .items}
 				{param groupName: $currentgroupName /}
@@ -151,10 +156,6 @@
 				{param spritemap: $spritemap /}
 			{/call}
 		{else}
-			{if isFirst($item)}
-				<ul class="card-page">
-			{/if}
-
 			{call .item}
 				{param groupName: $groupName /}
 				{param handleItemToggled_: $handleItemToggled_ /}
@@ -163,10 +164,6 @@
 				{param selectable: $selectable /}
 				{param spritemap: $spritemap /}
 			{/call}
-
-			{if isLast($item)}
-				</ul>
-			{/if}
 		{/if}
 	{/foreach}
 {/template}