Minor UI improvements

ApelegHQ · Jul 2, 2024 · 66bf8fa · 66bf8fa
1 parent c55478d
commit 66bf8fa
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 32 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@exact-realty/cms-ep-sfx",
-	"version": "1.0.11",
+	"version": "1.0.12",
 	"description": "Secure File Sharing Utility",
 	"type": "module",
 	"main": "-",

diff --git a/src/components/DemoBanner.css b/src/components/DemoBanner.css
@@ -18,6 +18,7 @@
 	font-size: 1.2em;
 	background-color: #f00;
 	color: #fff;
+	border: 1px solid #600;
 	font-weight: bold;
 	user-select: none;
 	pointer-events: none;

diff --git a/src/components/Footer.css b/src/components/Footer.css
@@ -46,9 +46,22 @@
 	text-align: center;
 }
 
-.footer-package-name {
+.footer-package-info {
 	display: block;
 	text-align: center;
 	font-size: 0.85em;
 	font-style: italic;
 }
+
+.footer-package-info li {
+	display: inline;
+}
+
+.footer-package-info li + li::before {
+	content: ' | ';
+	font-style: normal;
+}
+
+.footer-package-info a {
+	text-decoration: underline;
+}
diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte
@@ -48,34 +48,41 @@
 			reserved.
 		</p>
 		{#if packageName}
-			<p class="footer-package-name" lang="en">
-				Build information:{' '}
-				{packageName}
-				{#if packageVersion}{' '}v{packageVersion}{/if}
-				{#if gitCommitHash}
-					{' '}(<data lang="zxx" value={gitCommitHash}
-						>{gitCommitHash.slice(0, 7)}</data
-					>)
-				{/if}
+			<ul class="footer-package-info" lang="en">
+				<li>
+					Build information:{' '}
+					{packageName}
+					{#if packageVersion}{' '}v{packageVersion}{/if}
+					{#if gitCommitHash}
+						{' '}(<data lang="zxx" value={gitCommitHash}
+							>{gitCommitHash.slice(0, 7)}</data
+						>)
+					{/if}
+				</li>
+
 				{#if packageHomepage}
-					{' | '}<a
-						href={packageHomepage}
-						rel="me external noopener noreferrer"
-						target="_blank"
-					>
-						Home
-					</a>
+					<li>
+						<a
+							href={packageHomepage}
+							rel="me external noopener noreferrer"
+							target="_blank"
+						>
+							Home
+						</a>
+					</li>
 				{/if}
 				{#if repository}
-					{' | '}<a
-						href={repository}
-						rel="me external noopener noreferrer"
-						target="_blank"
-					>
-						Source
-					</a>
+					<li>
+						<a
+							href={repository}
+							rel="me external noopener noreferrer"
+							target="_blank"
+						>
+							Source
+						</a>
+					</li>
 				{/if}
-			</p>
+			</ul>
 		{/if}
 	</div>
 </footer>
diff --git a/src/lib/generateHtml.ts b/src/lib/generateHtml.ts
@@ -73,7 +73,7 @@ export const tbsPayload_ = async (
 		` content="default-src 'none'; script-src 'self' 'unsafe-eval' blob: data:; script-src-elem blob: data: '${fallbackMessage.sri}' '${loader.sri}' '${mainScriptTextSriDigest}'; script-src-attr 'none'; style-src data: '${cssTextSriDigest}'; child-src blob:; connect-src blob: data:; frame-src blob:; worker-src blob:; form-action data:"` +
 		'/>' +
 		`<title>HTML CMS Tool</title>` +
-		`<script src="data:text/javascript;base64,${xmlEscapeAttr(fallbackMessage.contentBase64)}" integrity="${xmlEscapeAttr(fallbackMessage.sri)}" crossorigin="anonymous">` +
+		`<script src="data:text/javascript;base64,${encodeURIComponent(fallbackMessage.contentBase64)}" integrity="${xmlEscapeAttr(fallbackMessage.sri)}" crossorigin="anonymous">` +
 		`</script>` +
 		'\r\n' +
 		`<script type="text/plain" data-integrity="${xmlEscapeAttr(mainScriptTextSriDigest)}" id="${xmlEscapeAttr(MAIN_SCRIPT_SRC_ELEMENT_ID_)}">` +
@@ -82,9 +82,9 @@ export const tbsPayload_ = async (
 		commentCdataEscapeSequenceEnd +
 		`</script>` +
 		'\r\n' +
-		`<link rel="stylesheet" href="data:text/css;base64,${xmlEscapeAttr(bbtoa(cssText))}" crossorigin="anonymous" integrity="${xmlEscapeAttr(cssTextSriDigest)}" id="${xmlEscapeAttr(MAIN_STYLESHEET_ELEMENT_ID_)}"/>` +
+		`<link rel="stylesheet" href="data:text/css;base64,${encodeURIComponent(bbtoa(cssText))}" crossorigin="anonymous" integrity="${xmlEscapeAttr(cssTextSriDigest)}" id="${xmlEscapeAttr(MAIN_STYLESHEET_ELEMENT_ID_)}"/>` +
 		'\r\n' +
-		`<script src="data:text/javascript;base64,${xmlEscapeAttr(loader.contentBase64)}" defer="defer" integrity="${xmlEscapeAttr(loader.sri)}" crossorigin="anonymous">` +
+		`<script src="data:text/javascript;base64,${encodeURIComponent(loader.contentBase64)}" defer="defer" integrity="${xmlEscapeAttr(loader.sri)}" crossorigin="anonymous">` +
 		'</script>' +
 		`<script type="text/plain" id="${xmlEscapeAttr(OPENPGP_SIGNATURE_ELEMENT_ID_)}">` +
 		commentCdataEscapeSequenceStart

diff --git a/src/pages/common.css b/src/pages/common.css
@@ -75,6 +75,7 @@
 	font-size: 0.875em;
 	text-transform: uppercase;
 	color: #a26135;
+	cursor: pointer;
 }
 
 .checkbox input {
@@ -101,6 +102,10 @@
 	color: #333;
 }
 
+.checkbox input:disabled + span {
+	cursor: not-allowed;
+}
+
 .label input,
 .label textarea {
 	display: block;

diff --git a/src/pages/encrypt.css b/src/pages/encrypt.css
@@ -15,7 +15,7 @@
 
 .dropzone {
 	display: block;
-	color: black;
+	color: #333;
 	min-height: 6em;
 	text-align: center;
 	cursor: pointer;