Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Add cancel button to wizard docs and update modal button spacing #689

Merged
merged 3 commits into from
May 16, 2017
Merged

Add cancel button to wizard docs and update modal button spacing #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf2b72f
Add cancel button to wizard docs and update modal button spacing
Blackbaud-PatrickOFriel May 15, 2017
0dd9da0
Merge branch 'master' into wizard-action-bar
Blackbaud-PatrickOFriel May 15, 2017
cf7bf18
Merge branch 'master' into wizard-action-bar
Blackbaud-PatrickOFriel May 16, 2017
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
6 changes: 6 additions & 0 deletions src/app/components/wizard/wizard-demo-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,11 @@
>
Save and close
</button>
<button
type="button"
class="sky-btn sky-btn-link"
(click)="instance.cancel()">
Cancel
</button>
</sky-modal-footer>
</sky-modal>
14 changes: 14 additions & 0 deletions src/modules/modal/modal.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,20 @@

.sky-modal-footer {
flex-shrink: 0;
/deep/ sky-tabset-nav-button + sky-tabset-nav-button {
margin-left: $sky-margin;
}
/deep/ sky-tabset-nav-button + .sky-btn {
margin-left: $sky-margin;
}

/deep/ .sky-btn + .sky-btn {
margin-left: $sky-margin;
}

/deep/ .sky-btn + .sky-btn-link {
margin-left: -2px; /* offset the padding of the btn-link */
}
}

.sky-modal-full-page {
Expand Down