diff --git a/src/web/dialog.js b/src/web/confirm.js
similarity index 98%
rename from src/web/dialog.js
rename to src/web/confirm.js
index fe4d152..4717dfd 100644
--- a/src/web/dialog.js
+++ b/src/web/confirm.js
@@ -2,6 +2,7 @@ import { L10n } from "./l10n.mjs";
import { SafeBccConfirmation } from "./safe-bcc-confirmation.mjs";
import { AddedDomainsReconfirmation } from "./added-domains-reconfirmation.mjs";
import { AttachmentsConfirmation } from "./attachments-confirmation.mjs";
+import * as Dialog from "./dialog.mjs";
let l10n;
let safeBccConfirmation;
@@ -174,6 +175,8 @@ async function onMessageFromParent(arg) {
)
);
+ Dialog.resizeToContent();
+
addedDomainsReconfirmation.init(data);
addedDomainsReconfirmation.initUI(sendStatusToParent);
diff --git a/src/web/count-down.css b/src/web/count-down.css
index c527d57..b0b9f62 100644
--- a/src/web/count-down.css
+++ b/src/web/count-down.css
@@ -1,19 +1,3 @@
-fluent-card {
- margin-top: 20px;
- padding-bottom: 20px;
- padding-left: 10px;
- padding-right: 10px;
-}
-
#count {
font-size: x-large;
}
-
-.button-container {
- margin-top: 20px;
- text-align: right;
-}
-
-#cancel-button {
- margin-left: 10px;
-}
diff --git a/src/web/count-down.html b/src/web/count-down.html
index 3c1e717..475adf2 100644
--- a/src/web/count-down.html
+++ b/src/web/count-down.html
@@ -6,16 +6,19 @@
+
-
-
-
-
-
-
+
diff --git a/src/web/count-down.js b/src/web/count-down.js
index 0cce87f..a06de89 100644
--- a/src/web/count-down.js
+++ b/src/web/count-down.js
@@ -1,4 +1,5 @@
import { L10n } from "./l10n.mjs";
+import * as Dialog from "./dialog.mjs";
let l10n;
@@ -44,6 +45,8 @@ async function onMessageFromParent(arg) {
$("#count").text(data.config.common.CountSeconds);
$("#message").show();
+ Dialog.resizeToContent();
+
const start = Date.now();
const timer = window.setInterval(() => {
const rest = Math.ceil(data.config.common.CountSeconds - (Date.now() - start) / 1000);
diff --git a/src/web/dialog.css b/src/web/dialog.css
index 0f36a74..f3c5ef7 100644
--- a/src/web/dialog.css
+++ b/src/web/dialog.css
@@ -9,35 +9,32 @@ fluent-divider {
margin: 1em 0;
}
-.heading-container {
- display: flex;
- align-items: center;
-}
-
.card-container {
- margin-left: 20px;
- margin-right: 20px;
-}
-
-.heading-container fluent-button {
- margin-left: 10px;
-}
-
-.check-target {
- margin-left: 20px;
display: flex;
- margin-bottom: 10px;
+ flex-direction: column;
+ height: 100%;
+ left: 0;
+ position: fixed;
+ top: 0;
+ width: 100%;
}
-#untrusted-domains fluent-checkbox::part(label) {
- color: red;
+.cards,
+.button-container {
+ padding-left: 20px;
+ padding-right: 20px;
}
-#attachment-and-others fluent-checkbox.warning::part(label) {
- color:red;
+.cards {
+ align-items: stretch;
+ display: flex;
+ flex-flow: column;
+ justify-content: flex-start;
+ overflow: auto;
}
.button-container {
+ padding-bottom: 10px;
margin-top: 20px;
text-align: right;
}
@@ -45,50 +42,3 @@ fluent-divider {
#cancel-button {
margin-left: 10px;
}
-
-/* fluent-dialog {
- --dialog-background-color: red;
- background: red !important;
- padding: 1.5em;
- color: white !important;
- font-size: x-large !important;
- font-weight: bold !important;
- text-align: center;
-} */
-
-fluent-dialog::part(control) {
- color: white;
- background-color: red;
- padding: 0 1.5em 1.5em 1.5em;
- text-align: center;
- --dialog-width: fit-content;
- --dialog-height: fit-content;
-}
-
-fluent-dialog::part(control) .newly-added-domain-content {
- background-color: white;
- background: var(--bg-color) !important;
-}
-
-fluent-dialog .newly-added-domain-content {
- color: black;
- padding: 2em;
- text-align: left;
-}
-
-fluent-dialog .newly-added-domain-content strong {
- font-size: large;
- font-weight: bold;
-}
-
-#newly-added-domain-address-list {
- margin: 1em 0;
-}
-
-#cancel-new-domain-button {
- margin-left: 10px;
-}
-
-.new-domain-button-container {
- margin-top: 20px;
-}
\ No newline at end of file
diff --git a/src/web/dialog.mjs b/src/web/dialog.mjs
new file mode 100644
index 0000000..33fcdd1
--- /dev/null
+++ b/src/web/dialog.mjs
@@ -0,0 +1,16 @@
+/*
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+"use strict";
+
+export function resizeToContent() {
+ const range = document.createRange();
+ range.selectNodeContents(document.querySelector(".card-container"));
+ const contentsRect = range.getBoundingClientRect();
+
+ const widthDelta = contentsRect.width - window.innerWidth;
+ const heightDelta = contentsRect.height - window.innerHeight;
+ window.resizeBy(Math.min(0, widthDelta), Math.min(0, heightDelta));
+}
diff --git a/webpack.config.js b/webpack.config.js
index d1b662e..fbc1686 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -19,7 +19,7 @@ module.exports = async (env, options) => {
entry: {
polyfill: ["core-js/stable", "regenerator-runtime/runtime"],
app: ["./src/web/app.js"],
- dialog: ["./src/web/dialog.js"],
+ confirm: ["./src/web/confirm.js"],
"count-down": ["./src/web/count-down.js"],
},
output: {
@@ -83,9 +83,9 @@ module.exports = async (env, options) => {
],
}),
new HtmlWebpackPlugin({
- filename: "dialog.html",
- template: "./src/web/dialog.html",
- chunks: ["polyfill", "dialog"],
+ filename: "confirm.html",
+ template: "./src/web/confirm.html",
+ chunks: ["polyfill", "confirm"],
}),
new HtmlWebpackPlugin({
filename: "count-down.html",