Skip to content
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.

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

feat(badge): add new badge component #111

Merged
merged 16 commits into from
Jan 12, 2018
Merged

feat(badge): add new badge component #111

merged 16 commits into from
Jan 12, 2018

Conversation

yggg
Copy link
Contributor

@yggg yggg commented Dec 20, 2017

No description provided.

@nnixaa
Copy link
Collaborator

nnixaa commented Dec 21, 2017

@yggg let's check why the tests are failing and please rebase on master so that we can merge it.

@@ -24,6 +24,7 @@ import { convertToBoolProperty } from '../helpers';
<ng-template #showContent>
<ng-content></ng-content>
</ng-template>
<nb-badge *ngIf="badgeText" text={{badgeText}} status={{badgeStatus}} position={{badgePosition}}></nb-badge>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add spaces inside of {{ }} statement. Moreover, in this case [text]="badgeText" [status]="badgeStatus" should look even better.

@@ -103,6 +124,11 @@ export class NbTabComponent {
(click)="selectTab(tab)"
[class.active]="tab.active">
<a href (click)="$event.preventDefault()">{{ tab.tabTitle }}</a>
<nb-badge *ngIf="tab.badgeText"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here and below.

@@ -115,6 +115,13 @@ $theme: (
smart-table-paging-fg-active: color-fg-heading,
smart-table-paging-bg-active: color-primary,
smart-table-paging-hover: rgba(0, 0, 0, 0.2),

badge-fg-text: color-fg-text,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

color-white looks better.

@@ -398,6 +398,13 @@ $theme: (
modal-body-font-weight: font-weight-normal,
modal-body-font-size: font-size,
modal-separator: separator,

badge-fg-text: color-fg-text,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

color-white looks better.

nnixaa
nnixaa previously approved these changes Dec 29, 2017
@nnixaa
Copy link
Collaborator

nnixaa commented Dec 29, 2017

@yggg we probably have to make the component public at the end, as currently we won't have any documentation on it and it won't be clear how to change its styles. Let's discuss next week.

@nnixaa nnixaa merged commit a9324b4 into akveo:master Jan 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants