Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-16 02:27:00 +02:00
Code Issues Projects Releases Wiki Activity

tweaks to swal2

Browse Source
This commit is contained in:
Kyle Spearrin 2020-02-24 10:13:26 -05:00
parent 84af4ee48f
commit 663a84a3c4
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/accounts/settings.component.ts
View File

@ -137,7 +137,7 @@ export class SettingsComponent implements OnInit {
label.innerHTML = '<input type="checkbox" id="master-pass-restart" checked>'; label.innerHTML = '<input type="checkbox" id="master-pass-restart" checked>';
label.appendChild(checkboxText); label.appendChild(checkboxText);
div.innerHTML = div.innerHTML =
`<div class="swal2-text">${this.i18nService.t('setYourPinCode')}</div>` + `<div class="swal2-text">${this.i18nService.t('setYourPinCode')}</div>` +
'<input type="text" class="swal2-input" id="pin-val" autocomplete="off" ' + '<input type="text" class="swal2-input" id="pin-val" autocomplete="off" ' +
'autocapitalize="none" autocorrect="none" spellcheck="false" inputmode="verbatim">'; 'autocapitalize="none" autocorrect="none" spellcheck="false" inputmode="verbatim">';
@ -146,9 +146,10 @@ export class SettingsComponent implements OnInit {
div.appendChild(label); div.appendChild(label);
const submitted = await Swal.fire({ const submitted = await Swal.fire({
heightAuto: false,
buttonsStyling: false,
text: this.i18nService.t('setYourPinCode'), text: this.i18nService.t('setYourPinCode'),
html: div, html: div,
showCancelButton: true, showCancelButton: true,
cancelButtonText: this.i18nService.t('cancel'), cancelButtonText: this.i18nService.t('cancel'),
showConfirmButton: true, showConfirmButton: true,

19
src/scss/plugins.scss
View File

@ -129,7 +129,7 @@ $fa-font-path: "~font-awesome/fonts";
border: 1px solid #000000; border: 1px solid #000000;
border-radius: $border-radius; border-radius: $border-radius;
margin-bottom: 0; margin-bottom: 0;
box-shadow: none;
// Inherit theme font-size // Inherit theme font-size
font-size: inherit; font-size: inherit;
@ -168,21 +168,14 @@ $fa-font-path: "~font-awesome/fonts";
margin: 0; margin: 0;
justify-content: flex-end; justify-content: flex-end;
.swal2-styled { button {
margin-left: 10px;
@extend .btn; @extend .btn;
&:focus { &.swal2-confirm {
box-shadow: none; @extend .btn.primary;
font-weight: bold;
} }
} }
.swal2-confirm {
// Overwrite border-left and border-right-color
@include themify($themes) {
border-color: themed('buttonBorderColor') !important;
}
@extend .btn.primary;
}
} }
} }