Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-10-04 05:08:06 +02:00
Code Issues Projects Releases Wiki Activity

update jslib and swal2 styles

Browse Source
This commit is contained in:
Kyle Spearrin 2020-03-04 14:14:27 -05:00
parent 465564325e
commit 73c192ad18
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit da9b9b438c4028b16f0d02d9e83477dce9378a16 Subproject commit 44b86f5dd028271059b70a00d7878fbb1a06023f

2
package.json
View File

@ -89,7 +89,7 @@
"popper.js": "1.14.4", "popper.js": "1.14.4",
"qrious": "4.0.2", "qrious": "4.0.2",
"rxjs": "6.3.3", "rxjs": "6.3.3",
"sweetalert2": "^9.8.1", "sweetalert2": "9.8.1",
"web-animations-js": "2.3.1", "web-animations-js": "2.3.1",
"webcrypto-shim": "0.1.4", "webcrypto-shim": "0.1.4",
"whatwg-fetch": "3.0.0", "whatwg-fetch": "3.0.0",

15
src/scss/plugins.scss
View File

@ -94,15 +94,19 @@ $fa-font-path: "~font-awesome/fonts";
} }
.swal2-popup { .swal2-popup {
padding: 0; padding: 15px 0 0;
background-color: $modal-content-bg; background-color: $modal-content-bg;
color: $body-color; color: $body-color;
border: $modal-content-border-width solid #9a9a9a; border: $modal-content-border-width solid #9a9a9a;
@include border-radius($modal-content-border-radius); @include border-radius($modal-content-border-radius);
width: 34em; // slightly bigger than the hardcoded 478px in v1. width: 34em; // slightly bigger than the hardcoded 478px in v1.
.swal2-header {
padding: 0 15px;
}
.swal2-icon { .swal2-icon {
margin: 15px auto 0 auto; margin: 0 auto;
width: auto; width: auto;
height: auto; height: auto;
border: none; border: none;
@ -121,7 +125,7 @@ $fa-font-path: "~font-awesome/fonts";
} }
.swal2-title { .swal2-title {
padding: 10px 10px 15px 10px; padding: 10px 0 15px;
margin: 0; margin: 0;
font-size: $font-size-lg; font-size: $font-size-lg;
color: $body-color; color: $body-color;
@ -130,10 +134,11 @@ $fa-font-path: "~font-awesome/fonts";
.swal2-content { .swal2-content {
font-size: $font-size-base; font-size: $font-size-base;
color: $body-color; color: $body-color;
padding: 0 15px 15px;
} }
.swal2-actions { .swal2-actions {
padding: 15px 10px 10px 10px; padding: 15px;
margin: 0; margin: 0;
background-color: $input-bg; background-color: $input-bg;
@include border-radius($modal-content-border-radius); @include border-radius($modal-content-border-radius);
@ -143,7 +148,7 @@ $fa-font-path: "~font-awesome/fonts";
font-size: $font-size-base; font-size: $font-size-base;
button { button {
margin-left: 10px; margin-right: 10px;
@extend .btn; @extend .btn;
&.swal2-confirm { &.swal2-confirm {

2
src/services/webPlatformUtils.service.ts
View File

@ -178,7 +178,7 @@ export class WebPlatformUtilsService implements PlatformUtilsService {
} }
async showDialog(text: string, title?: string, confirmText?: string, cancelText?: string, type?: string) { async showDialog(text: string, title?: string, confirmText?: string, cancelText?: string, type?: string) {
let iconClasses = null; let iconClasses: string = null;
if (type != null) { if (type != null) {
// If you add custom types to this part, the type to SweetAlertIcon cast below needs to be changed. // If you add custom types to this part, the type to SweetAlertIcon cast below needs to be changed.
switch (type) { switch (type) {