From 18928a76b926558189c9582dff17c4a44cd04bcd Mon Sep 17 00:00:00 2001
From: Tamara Steinwender <tamara.steinwender@tugraz.at>
Date: Wed, 24 Feb 2021 11:48:54 +0100
Subject: [PATCH] Improve filepicker and small fixes
---
src/dbp-official-signature-pdf-upload.js | 15 ++++++++-------
src/dbp-qualified-signature-pdf-upload.js | 17 +++++++++--------
src/dbp-signature-verification-full.js | 15 ++++++++-------
src/dbp-signature-verification.js | 7 +++----
vendor/toolkit | 2 +-
5 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/src/dbp-official-signature-pdf-upload.js b/src/dbp-official-signature-pdf-upload.js
index dd0876b..7777df5 100644
--- a/src/dbp-official-signature-pdf-upload.js
+++ b/src/dbp-official-signature-pdf-upload.js
@@ -399,14 +399,12 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
#pdf-preview {
min-width: 320px;
+ box-sizing: border-box;
}
h2:first-child {
margin-top: 0;
- }
-
- h2 {
- margin-bottom: 10px;
+ margin-bottom: 0px;
}
strong {
@@ -607,6 +605,8 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
font-style: italic;
padding-left: 2em;
margin-top: -5px;
+ line-height: 1.8;
+ margin-bottom: 1.2em;
}
/* Handling for small displays (like mobile devices) */
@@ -771,10 +771,11 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
<div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}">
<div class="field">
<h2>${i18n.t('official-pdf-upload.upload-field-label')}</h2>
+ <p class="subheadline">
+ ${i18n.t('official-pdf-upload.sub-headline')}
+ </p>
<div class="control">
- <p class="subheadline">
- ${i18n.t('official-pdf-upload.sub-headline')}
- </p>
+
<p>
${i18n.t('official-pdf-upload.upload-text')}
</p>
diff --git a/src/dbp-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js
index 30d4655..ed63509 100644
--- a/src/dbp-qualified-signature-pdf-upload.js
+++ b/src/dbp-qualified-signature-pdf-upload.js
@@ -528,16 +528,14 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
#pdf-preview {
min-width: 320px;
+ box-sizing: border-box;
}
h2:first-child {
margin-top: 0;
+ margin-bottom: 0px;
}
-
- h2 {
- margin-bottom: 10px;
- }
-
+
strong {
font-weight: 600;
}
@@ -754,6 +752,8 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
font-style: italic;
padding-left: 2em;
margin-top: -5px;
+ line-height: 1.8;
+ margin-bottom: 1.2em;
}
@@ -938,10 +938,11 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
<div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}">
<div class="field ${classMap({"is-disabled": this.isUserInterfaceDisabled()})}">
<h2>${i18n.t('qualified-pdf-upload.upload-field-label')}</h2>
+ <p class="subheadline">
+ ${i18n.t('qualified-pdf-upload.sub-headline')}
+ </p>
<div class="control">
- <p class="subheadline">
- ${i18n.t('qualified-pdf-upload.sub-headline')}
- </p>
+
<p>
${i18n.t('qualified-pdf-upload.upload-text')}
</p>
diff --git a/src/dbp-signature-verification-full.js b/src/dbp-signature-verification-full.js
index 44c9b50..df527ca 100644
--- a/src/dbp-signature-verification-full.js
+++ b/src/dbp-signature-verification-full.js
@@ -310,14 +310,12 @@ class SignatureVerificationFull extends ScopedElementsMixin(DBPSignatureLitEleme
#pdf-preview {
min-width: 320px;
+ box-sizing: border-box;
}
h2:first-child {
margin-top: 0;
- }
-
- h2 {
- margin-bottom: 10px;
+ margin-bottom: 0px;
}
strong {
@@ -521,6 +519,8 @@ class SignatureVerificationFull extends ScopedElementsMixin(DBPSignatureLitEleme
font-style: italic;
padding-left: 2em;
margin-top: -5px;
+ line-height: 1.8;
+ margin-bottom: 1.2em;
}
/* Handling for small displays (like mobile devices) */
@@ -695,10 +695,11 @@ class SignatureVerificationFull extends ScopedElementsMixin(DBPSignatureLitEleme
<div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}">
<div class="field">
<h2>${i18n.t('signature-verification.upload-field-label')}</h2>
+ <p class="subheadline">
+ ${i18n.t('signature-verification.sub-headline')}
+ </p>
<div class="control">
- <p class="subheadline">
- ${i18n.t('signature-verification.sub-headline')}
- </p>
+
<p>
${i18n.t('signature-verification.upload-text')}
</p>
diff --git a/src/dbp-signature-verification.js b/src/dbp-signature-verification.js
index 9f41f8d..449cdd6 100644
--- a/src/dbp-signature-verification.js
+++ b/src/dbp-signature-verification.js
@@ -54,10 +54,7 @@ class SignatureVerification extends ScopedElementsMixin(DBPSignatureLitElement)
h2:first-child {
margin-top: 0;
- }
-
- h2 {
- margin-bottom: 10px;
+ margin-bottom: 0px;
}
.int-link-internal{
@@ -98,6 +95,8 @@ class SignatureVerification extends ScopedElementsMixin(DBPSignatureLitElement)
font-style: italic;
padding-left: 2em;
margin-top: -5px;
+ line-height: 1.8;
+ margin-bottom: 1.2em;
}
`;
}
diff --git a/vendor/toolkit b/vendor/toolkit
index 588bd00..e2657f0 160000
--- a/vendor/toolkit
+++ b/vendor/toolkit
@@ -1 +1 @@
-Subproject commit 588bd00b5226d4092bd973dcb0b5529c7d836063
+Subproject commit e2657f037e1b08bf80c357858452406c90e17974
--
GitLab