Skip to content

Commit

Permalink
chore(Rebase) Rebase on top of master
Browse files Browse the repository at this point in the history
  • Loading branch information
@mlampedx
mlampedx committed Jun 4, 2018
2 parents a500028 + 7c91749 commit c41ee0d
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 9,198 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ coverage
node_modules
package-lock.json
yarn.lock
yarn-error.log
79 changes: 30 additions & 49 deletions src/components/List/__tests__/__snapshots__/Row.spec.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -729,28 +729,22 @@ exports[`<ListRow /> renders eventListRow with container 1`] = `
<div
className="c14 c15"
>
<path
d="M0 2.5C0 1.81.242 1.22.727.732A2.394 2.394 0 0 1 2.492 0a2.42 2.42 0 0 1 1.773.732C4.755 1.221 5 1.81 5 2.5s-.245 1.28-.735 1.768A2.42 2.42 0 0 1 2.492 5C1.8 5 1.212 4.756.727 4.268A2.418 2.418 0 0 1 0 2.5zm0 8.008c0-.692.242-1.283.727-1.773A2.39 2.39 0 0 1 2.492 8c.692 0 1.283.245 1.773.735S5 9.815 5 10.508a2.39 2.39 0 0 1-.735 1.765A2.43 2.43 0 0 1 2.492 13c-.692 0-1.28-.242-1.765-.727A2.403 2.403 0 0 1 0 10.508zM0 18.5c0-.69.242-1.28.727-1.768A2.394 2.394 0 0 1 2.492 16a2.42 2.42 0 0 1 1.773.732c.49.489.735 1.078.735 1.768s-.245 1.28-.735 1.768A2.42 2.42 0 0 1 2.492 21c-.692 0-1.28-.244-1.765-.732A2.418 2.418 0 0 1 0 18.5z"
/>
</svg>
</span>
</div>
</div>
</a>
<div
className="row c4"
>
<div
className="c21"
>
<a
className="c22"
color=""
href=""
rel="_self"
target=""
>
Ticket Options Available
<div
className="c12"
>
Del Mar Fairgrounds
</div>
</div>
<div
className="c16 c17"
>
<div
className="c12"
>
KABOO 3-Day Pass
</div>
</div>
</div>
</a>
</div>
<div
Expand Down Expand Up @@ -796,7 +790,10 @@ exports[`<ListRow /> renders eventListRow with container 1`] = `
>
<a
className="c24"
color=""
href=""
rel="_self"
target=""
>
Ticket Options Available
</a>
Expand Down Expand Up @@ -1580,19 +1577,11 @@ exports[`<ListRow /> renders eventListRow with link correctly 1`] = `
viewBox="0 0 5 21"
width={22}
>
<svg
fill="rgba(0, 0, 15, 0.6)"
height={22}
onClick={[Function]}
viewBox="0 0 5 21"
width={22}
>
<path
d="M0 2.5C0 1.81.242 1.22.727.732A2.394 2.394 0 0 1 2.492 0a2.42 2.42 0 0 1 1.773.732C4.755 1.221 5 1.81 5 2.5s-.245 1.28-.735 1.768A2.42 2.42 0 0 1 2.492 5C1.8 5 1.212 4.756.727 4.268A2.418 2.418 0 0 1 0 2.5zm0 8.008c0-.692.242-1.283.727-1.773A2.39 2.39 0 0 1 2.492 8c.692 0 1.283.245 1.773.735S5 9.815 5 10.508a2.39 2.39 0 0 1-.735 1.765A2.43 2.43 0 0 1 2.492 13c-.692 0-1.28-.242-1.765-.727A2.403 2.403 0 0 1 0 10.508zM0 18.5c0-.69.242-1.28.727-1.768A2.394 2.394 0 0 1 2.492 16a2.42 2.42 0 0 1 1.773.732c.49.489.735 1.078.735 1.768s-.245 1.28-.735 1.768A2.42 2.42 0 0 1 2.492 21c-.692 0-1.28-.244-1.765-.732A2.418 2.418 0 0 1 0 18.5z"
/>
</svg>
</span>
</div>
<path
d="M0 2.5C0 1.81.242 1.22.727.732A2.394 2.394 0 0 1 2.492 0a2.42 2.42 0 0 1 1.773.732C4.755 1.221 5 1.81 5 2.5s-.245 1.28-.735 1.768A2.42 2.42 0 0 1 2.492 5C1.8 5 1.212 4.756.727 4.268A2.418 2.418 0 0 1 0 2.5zm0 8.008c0-.692.242-1.283.727-1.773A2.39 2.39 0 0 1 2.492 8c.692 0 1.283.245 1.773.735S5 9.815 5 10.508a2.39 2.39 0 0 1-.735 1.765A2.43 2.43 0 0 1 2.492 13c-.692 0-1.28-.242-1.765-.727A2.403 2.403 0 0 1 0 10.508zM0 18.5c0-.69.242-1.28.727-1.768A2.394 2.394 0 0 1 2.492 16a2.42 2.42 0 0 1 1.773.732c.49.489.735 1.078.735 1.768s-.245 1.28-.735 1.768A2.42 2.42 0 0 1 2.492 21c-.692 0-1.28-.244-1.765-.732A2.418 2.418 0 0 1 0 18.5z"
/>
</svg>
</button>
</div>
</div>
<div
Expand All @@ -1602,7 +1591,7 @@ exports[`<ListRow /> renders eventListRow with link correctly 1`] = `
className="c22"
>
<a
className="c21"
className="c23"
color=""
href=""
rel="_self"
Expand Down Expand Up @@ -2289,19 +2278,11 @@ exports[`<ListRow /> renders standard eventListRow correctly 1`] = `
viewBox="0 0 5 21"
width={22}
>
<svg
fill="rgba(0, 0, 15, 0.6)"
height={22}
onClick={[Function]}
viewBox="0 0 5 21"
width={22}
>
<path
d="M0 2.5C0 1.81.242 1.22.727.732A2.394 2.394 0 0 1 2.492 0a2.42 2.42 0 0 1 1.773.732C4.755 1.221 5 1.81 5 2.5s-.245 1.28-.735 1.768A2.42 2.42 0 0 1 2.492 5C1.8 5 1.212 4.756.727 4.268A2.418 2.418 0 0 1 0 2.5zm0 8.008c0-.692.242-1.283.727-1.773A2.39 2.39 0 0 1 2.492 8c.692 0 1.283.245 1.773.735S5 9.815 5 10.508a2.39 2.39 0 0 1-.735 1.765A2.43 2.43 0 0 1 2.492 13c-.692 0-1.28-.242-1.765-.727A2.403 2.403 0 0 1 0 10.508zM0 18.5c0-.69.242-1.28.727-1.768A2.394 2.394 0 0 1 2.492 16a2.42 2.42 0 0 1 1.773.732c.49.489.735 1.078.735 1.768s-.245 1.28-.735 1.768A2.42 2.42 0 0 1 2.492 21c-.692 0-1.28-.244-1.765-.732A2.418 2.418 0 0 1 0 18.5z"
/>
</svg>
</span>
</div>
<path
d="M0 2.5C0 1.81.242 1.22.727.732A2.394 2.394 0 0 1 2.492 0a2.42 2.42 0 0 1 1.773.732C4.755 1.221 5 1.81 5 2.5s-.245 1.28-.735 1.768A2.42 2.42 0 0 1 2.492 5C1.8 5 1.212 4.756.727 4.268A2.418 2.418 0 0 1 0 2.5zm0 8.008c0-.692.242-1.283.727-1.773A2.39 2.39 0 0 1 2.492 8c.692 0 1.283.245 1.773.735S5 9.815 5 10.508a2.39 2.39 0 0 1-.735 1.765A2.43 2.43 0 0 1 2.492 13c-.692 0-1.28-.242-1.765-.727A2.403 2.403 0 0 1 0 10.508zM0 18.5c0-.69.242-1.28.727-1.768A2.394 2.394 0 0 1 2.492 16a2.42 2.42 0 0 1 1.773.732c.49.489.735 1.078.735 1.768s-.245 1.28-.735 1.768A2.42 2.42 0 0 1 2.492 21c-.692 0-1.28-.244-1.765-.732A2.418 2.418 0 0 1 0 18.5z"
/>
</svg>
</button>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit c41ee0d

Please sign in to comment.