Skip to content

add pill option to c-td-truncate #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 14, 2020
Merged

add pill option to c-td-truncate #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db04f5c
add pill option to c-td-truncate
lukelarsen Apr 13, 2020
c2c3711
Merge branch 'master' into c-tile-pill
lukelarsen Apr 13, 2020
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
2 changes: 1 addition & 1 deletion dev-app/app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
state="${link.isActive ? 'active' : ''}"
>
</c-nav-horizontal-item>
<c-nav-horizontal-item position="right" href="https://github.com/bindable-ui/bindable" title="v1.0.25"></c-nav-horizontal-item>
<c-nav-horizontal-item position="right" href="https://github.com/bindable-ui/bindable" title="v1.0.26"></c-nav-horizontal-item>
</c-nav-horizontal>
</l-box>
</l-sidebar>
Expand Down
3 changes: 2 additions & 1 deletion dev-app/routes/components/tables/table/views-and-view-models/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
</l-stack>
</div>

<divider></divider>
<c-divider></c-divider>

<div>
<l-stack spacing="var(--s-3)">
Expand Down Expand Up @@ -184,6 +184,7 @@
},
{
name: 'Han Solo is super cool and all that',
namePill: 'Pill',
ship: 'M. Falcon',
gender: 'Male',
},
Expand Down
2 changes: 1 addition & 1 deletion dev-app/routes/components/tables/table/views-and-view-models/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ export class TableViews {
{
gender: 'Male',
name: 'Han Solo is super cool and all that',
namePill: 'Pill',
ship: 'M. Falcon',
},
{
Expand Down Expand Up @@ -612,7 +613,6 @@ export class TableViews {
this.pillTableData = [
{
description: 'more text here',
descriptionPill: 'Desc Pill',
name: 'stuff here',
namePill: 'Name Pill',
},
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@bindable-ui/bindable",
"description": "An Aurelia component library",
"version": "1.0.25",
"version": "1.0.26",
"repository": {
"type": "git",
"url": "https://github.com/bindable-ui/bindable"
Expand Down
25 changes: 25 additions & 0 deletions src/components/tables/td-contents/c-td-pill/c-td-pill.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

/*
Copyright 2020, Verizon Media
Licensed under the terms of the MIT license. See the LICENSE file in the project root for license terms.
*/

/*------------------------------------*\
CONTENTS
\*------------------------------------*/

/**
* BASE
*/





/*------------------------------------*\
!BASE
\*------------------------------------*/

.text{
margin-left: var(--s-2);
}
14 changes: 12 additions & 2 deletions src/components/tables/td-contents/c-td-pill/c-td-pill.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,18 @@
-->

<template>
${value}
<c-pill>
<require from="./c-td-pill.css"></require>

<c-pill if.bind="row[col.colHeadName + 'Pill']">
<span slot="pill-content">${row[col.colHeadName + 'Pill']}</span>
</c-pill>
<span
if.bind="row[col.colHeadName + 'Pill']"
class="${styles.text}"
>
${value}
</span>
<span if.bind="!row[col.colHeadName + 'Pill']">
${value}
</span>
</template>
3 changes: 3 additions & 0 deletions src/components/tables/td-contents/c-td-pill/c-td-pill.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ Copyright 2020, Verizon Media
Licensed under the terms of the MIT license. See the LICENSE file in the project root for license terms.
*/

import * as styles from './c-td-pill.css.json';

export class CTdPill {
public styles = styles;
public value;

public activate(model) {
Expand Down
8 changes: 7 additions & 1 deletion src/components/tables/td-contents/c-td-truncate/c-td-truncate.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@ Licensed under the terms of the MIT license. See the LICENSE file in the project
.container > svg{
float: left;
margin-right: var(--s-2);
margin-top: 1px;
margin-top: 2px;
}

.container > c-pill{
float: left;
margin-right: var(--s-2);
margin-top: -1px;
}

.truncate{
Expand Down
3 changes: 3 additions & 0 deletions src/components/tables/td-contents/c-td-truncate/c-td-truncate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
icon="${row[col.colHeadName + 'Icon']}"
if.bind="row[col.colHeadName + 'Icon']"
></c-icon>
<c-pill if.bind="row[col.colHeadName + 'Pill']">
<span slot="pill-content">${row[col.colHeadName + 'Pill']}</span>
</c-pill>
<div class="${styles.truncate}">
<span title="${value}">
<span if.bind="!searchHighlight">${value}</span>
Expand Down