Skip to content
This repository has been archived by the owner on Jan 16, 2018. It is now read-only.

Update ClayButton markup to clay#2.0.0-beta.5 #238

Merged
merged 5 commits into from
Dec 27, 2017
Merged

Update ClayButton markup to clay#2.0.0-beta.5 #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7c7f0f4
Add spacing between the label and the icon in ClayButton
matuzalemsteles Dec 26, 2017
0168fdf
Update ClayButton snapshot
matuzalemsteles Dec 26, 2017
538d8ea
Update ClayTable snapshot
matuzalemsteles Dec 26, 2017
e4b5c58
SF
matuzalemsteles Dec 26, 2017
0213985
SF
Dec 27, 2017
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
55 changes: 41 additions & 14 deletions packages/clay-button/src/ClayButton.soy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,25 @@
{@param? label: html|string}
{@param? spritemap: string}

{if $icon and $iconAlignment == 'left' and $spritemap}
{call .icon}
{param icon: $icon /}
{param spritemap: $spritemap /}
{/call}
{let $iconContent kind="html"}
{if $icon and $spritemap}
{call .icon}
{param icon: $icon /}
{param iconAlignment: $iconAlignment /}
{param label: $label /}
{param spritemap: $spritemap /}
{/call}
{/if}
{/let}

{if $iconContent != '' and $iconAlignment == 'left'}
{$iconContent}
{/if}

{$label ?: ''}

{if $icon and $iconAlignment == 'right' and $spritemap}
{call .icon}
{param icon: $icon /}
{param spritemap: $spritemap /}
{/call}
{if $iconContent != '' and $iconAlignment == 'right'}
{$iconContent}
{/if}
{/template}

Expand All @@ -80,11 +85,33 @@
{template .icon}
{@param icon: string}
{@param spritemap: string}
{@param? iconAlignment: string}
{@param? label: html|string}

{let $iconContent kind="html"}
{call ClayIcon.render}
{param spritemap: $spritemap /}
{param symbol: $icon /}
{/call}
{/let}

{if $label}
{let $iconWrapperClasses kind="text"}
inline-item
{if $iconAlignment == 'left'}
{sp}inline-item-before
{elseif $iconAlignment == 'right'}
{sp}inline-item-after
{/if}
{/let}

<span class="{$iconWrapperClasses}">
{$iconContent}
</span>
{else}
{$iconContent}
{/if}

{call ClayIcon.render}
{param spritemap: $spritemap /}
{param symbol: $icon /}
{/call}
{/template}

/**
Expand Down
30 changes: 18 additions & 12 deletions packages/clay-button/src/__tests__/__snapshots__/ClayButton.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ exports[`ClayButton should render a button with icon 1`] = `

exports[`ClayButton should render a button with icon and label 1`] = `
<button class="btn btn-primary" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-plus">
<title>plus</title>
<use xlink:href="icons.svg#plus"></use>
</svg>Label</button>
<span class="inline-item inline-item-before">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-plus">
<title>plus</title>
<use xlink:href="icons.svg#plus"></use>
</svg>
</span>Label</button>
`;

exports[`ClayButton should render a button with icon and monospaced true 1`] = `
Expand All @@ -38,18 +40,22 @@ exports[`ClayButton should render a button with label and ariaLabel 1`] = `<butt

exports[`ClayButton should render a button with label and icon 1`] = `
<button class="btn btn-primary" type="button">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-plus">
<title>plus</title>
<use xlink:href="icons.svg#plus"></use>
</svg>Label</button>
<span class="inline-item inline-item-before">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-plus">
<title>plus</title>
<use xlink:href="icons.svg#plus"></use>
</svg>
</span>Label</button>
`;

exports[`ClayButton should render a button with label and icon on right side 1`] = `
<button class="btn btn-primary" type="button">Label
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-plus">
<title>plus</title>
<use xlink:href="icons.svg#plus"></use>
</svg>
<span class="inline-item inline-item-after">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-plus">
<title>plus</title>
<use xlink:href="icons.svg#plus"></use>
</svg>
</span>
</button>
`;

Expand Down
10 changes: 6 additions & 4 deletions packages/clay-table/src/__tests__/__snapshots__/ClayTable.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,12 @@ exports[`ClayTable should render a ClayTable with a basic schema with sortable f
<tr>
<th class="table-cell-expand">
<button class="btn btn-unstyled" type="button">Title
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-order-arrow-up">
<title>order-arrow-up</title>
<use xlink:href="../node_modules/lexicon-ux/build/images/icons/icons.svg#order-arrow-up"></use>
</svg>
<span class="inline-item inline-item-after">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-order-arrow-up">
<title>order-arrow-up</title>
<use xlink:href="../node_modules/lexicon-ux/build/images/icons/icons.svg#order-arrow-up"></use>
</svg>
</span>
</button>
</th>
<th>
Expand Down