Commit dfaf5af1 authored by Emily Jensen's avatar Emily Jensen

Merge from dev

parents c1bdd86c c870167e
Pipeline #38365620 failed with stage
in 5 minutes and 53 seconds
......@@ -34,10 +34,11 @@
<div class="form-field__wrapper-for-link">
<label [for]="form.controls.password.id" class="form-field__label">Password</label>
<aside-link
text="Forgot? Recover your account"
tabindex="8"
[link]="['/reset-password']"
></aside-link>
>
<span class="u-visible--all-but-small">Forgot? </span>Recover&nbsp;your&nbsp;account
</aside-link>
</div>
<input
type="password"
......
......@@ -62,10 +62,11 @@
></Label>
<aside-link
text="Forgot? Recover your account"
tabindex="8"
[link]="['/reset-password']"
></aside-link>
>
Forgot? Recover your account
</aside-link>
<progress-indicator
[inProgress]="hasLoginStarted"
......
......@@ -4,5 +4,5 @@
[routerLink]="link"
[tabindex]="tabindex"
>
<span class="u-visible--all-but-small">{{ text }}</span>
<ng-content></ng-content>
</a>
\ No newline at end of file
<Label
[text]="text"
[nsRouterLink]="link"
></Label>
\ No newline at end of file
>
<ng-content></ng-content>
</Label>
\ No newline at end of file
......@@ -10,7 +10,6 @@ import { Component, Input } from "@angular/core";
styleUrls: ["./aside-link.component.css"]
})
export class AsideLinkComponent {
@Input() text: string;
@Input() link: string[];
@Input() tabindex: string;
......
import { storiesOf, moduleMetadata } from "@storybook/angular";
import { withKnobs } from "@storybook/addon-knobs";
import { AsideLinkComponent } from "~/app/shared/aside-link/aside-link.component";
import { RouterTestingModule } from "@angular/router/testing";
import { SharedModule } from "~/app/shared";
storiesOf("Shared", module)
.addDecorator(withKnobs)
.addDecorator(
moduleMetadata({
imports: [RouterTestingModule]
imports: [
RouterTestingModule,
SharedModule
]
})
)
.add("Aside Link", () => ({
component: AsideLinkComponent,
props: {
text: "Try clicking here"
}
template: `
<aside-link>
Here's an aside <em>link</em>!
</aside-link>
`
}));
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment