Skip to content

Fix/fix modal footer line #119

Merged
merged 2 commits into from
May 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions packages/mosaic-dev/modal/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ export class ModalDemoComponent {
' or an alert. It will be <b>deleted</b> there too. </br></br>' +
'Delete the selected action anyway?',
mcOkType : 'error',
mcOkText : 'Yes',
mcCancelText: 'No',
mcOkText : 'Delete',
mcCancelText: 'Cancel',
mcWidth : '480px',
mcOnOk : () => console.log('OK'),
mcOnOk : () => console.log('Delete'),
mcOnCancel : () => console.log('Cancel')
});
}
Expand Down Expand Up @@ -100,7 +100,8 @@ export class ModalDemoComponent {
let pos = 0;

[ 'create', 'delete', 'success' ].forEach((method) => this.modalService[method]({
mcOkText : 'Yes',
mcOkText : 'Confirm',
mcCancelText: 'Cancel',
mcMask: false,
mcContent: `Test content: <b>${method}</b>`,
mcStyle: { position: 'absolute', top: `${pos * 70}px`, left: `${(pos++) * 300}px` }
Expand Down
2 changes: 1 addition & 1 deletion packages/mosaic/modal/_modal-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
.mc-confirm {
// todo почему футер внезапно перестал быть футером ?
.mc-confirm-btns {
border-top: 1px solid $inner-border;
background-color: if($is-dark, transparent, mc-color($second, 60));
border-top: 1px solid mc-color($second, 60);
}
}
}
Expand Down