Project

General

Profile

« Previous | Next » 

Revision 56051

[Library|newlinking]
Merging trunk|library into branch newlinking 55972:56049

View differences:

alert.ts
20 20
          <button class="uk-button uk-button-default" (click)="ok()">{{okButtonText}}</button>
21 21
        </span>
22 22
        <span [hidden]=!cancelButton>
23
          <button class="uk-button uk-button-default" (click)="cancel()">{{cancelButtonText}}</button>
23
          <button class="uk-button uk-button-default uk-margin-small-left" (click)="cancel()">{{cancelButtonText}}</button>
24 24
        </span>
25 25
        </div>
26 26
        <div *ngIf="!okButtonLeft" class="uk-text-right" [hidden]=!alertFooter>
27 27
         <span [hidden]=!cancelButton>
28
          <button class="uk-button uk-button-default" (click)="cancel()">{{cancelButtonText}}</button>
28
          <button class="uk-button uk-button-default uk-margin-small-right" (click)="cancel()">{{cancelButtonText}}</button>
29 29
        </span>
30 30
        <span [hidden]=!okButton >
31 31
          <button *ngIf="okDisabled" class="uk-button uk-button-default" disabled>{{okButtonText}}</button>

Also available in: Unified diff