diff --git a/src/ui/dark.qss b/src/ui/dark.qss
index 5eb1a4a3..1f3d8b11 100644
--- a/src/ui/dark.qss
+++ b/src/ui/dark.qss
@@ -30,12 +30,11 @@ CertificateButton #warn, CertificateWidget #warn {
color: #F54A67;
}
QLineEdit {
-background-color: rgba(255,255,255,0.1);
-border-color: #008EEA;
+border-color: #909299;
+color: #FFFFFF;
}
QLineEdit[warning="true"] {
-border-color: #F54A67;
-color: #F54A67;
+border-color: #FF5C79;
}
QProgressBar {
background-color: rgba(255,255,255,0.1);
@@ -52,7 +51,7 @@ color: #FFFFFF;
color: white;
}
#pinErrorLabel {
-color: #F54A67;
+color: #FF5C79;
}
#aboutContent {
border-color: #4E4E53;
diff --git a/src/ui/dialog.ui b/src/ui/dialog.ui
index 1d87fa4a..5196f8fd 100644
--- a/src/ui/dialog.ui
+++ b/src/ui/dialog.ui
@@ -88,24 +88,16 @@ CertificateButton #warn, CertificateWidget #warn {
color: #CD2541;
}
QLineEdit {
-border: 2px solid #113F8E;
-color: #113F8E;
-border-radius: 3px;
-min-width: 200px;
-min-height: 45px;
-max-width: 200px;
-max-height: 45px;
-font-size: 26px;
-font-weight: bold;
-padding-right: 14px;
-padding-left: 14px;
-padding-top: 0px;
-padding-bottom: 0px;
+border: 1px solid #C4CBD8;
+color: #607496;
+border-radius: 8px;
+font-size: 16px;
+padding: 10px 14px;
lineedit-password-character: 42;
}
QLineEdit[warning="true"] {
-border: 2px solid #CD2541;
-color: #CD2541;
+border: 1px solid #AD2A45;
+color: #07142A;
}
QProgressBar {
height: 30px;
@@ -132,10 +124,12 @@ color: #003168;
font-weight: bold;
max-height: 20px;
}
-#pinTitleLabel, #pinErrorLabel {
-max-height: 20px;
+#pinTitleLabel {
+font-size: 14px;
+color: #07142A;
}
#pinErrorLabel {
+font-size: 14px;
color: #CD2541;
}
#fatalError {
@@ -569,29 +563,19 @@ border-radius: 4px;
-
- 10
+ 6
-
-
-
- Roboto
- -1
- true
-
-
Enter PIN1 for authentication
-
- Qt::AlignCenter
-
pinInput
- -
+
-
12
@@ -603,21 +587,12 @@ border-radius: 4px;
-
-
-
- 0
- 36
-
-
Qt::TabFocus
2 tries left
-
- Qt::AlignCenter
-
true
@@ -640,19 +615,6 @@ border-radius: 4px;
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 5
-
-
-
-
diff --git a/src/ui/images/alert.svg b/src/ui/images/alert.svg
new file mode 100644
index 00000000..02cd30dc
--- /dev/null
+++ b/src/ui/images/alert.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/ui/images/alert_dark.svg b/src/ui/images/alert_dark.svg
new file mode 100644
index 00000000..82f693a7
--- /dev/null
+++ b/src/ui/images/alert_dark.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/ui/webeiddialog.cpp b/src/ui/webeiddialog.cpp
index 2b3b1fac..b85136a3 100644
--- a/src/ui/webeiddialog.cpp
+++ b/src/ui/webeiddialog.cpp
@@ -62,6 +62,7 @@ using namespace electronic_id;
class WebEidDialog::Private : public Ui::WebEidDialog
{
public:
+ observer_ptr pinInputAlert;
observer_ptr pinInputValidator;
observer_ptr pinTimeoutTimer;
observer_ptr selectionGroup;
@@ -103,6 +104,15 @@ WebEidDialog::WebEidDialog(QWidget* parent) : WebEidUI(parent), ui(new Private)
auto pinInputFont = ui->pinInput->font();
pinInputFont.setLetterSpacing(QFont::AbsoluteSpacing, 2);
ui->pinInput->setFont(pinInputFont);
+ ui->pinInputAlert = new QSvgWidget(ui->pinInput);
+ ui->pinInputAlert->load(Application::isDarkTheme() ? u":/images/alert_dark.svg"_s
+ : u":/images/alert.svg"_s);
+ ui->pinInputAlert->setFixedSize(20, 20);
+ ui->pinInputAlert->hide();
+ auto *pinInputLayout = new QHBoxLayout(ui->pinInput);
+ pinInputLayout->setContentsMargins(10, 10, 10, 10);
+ pinInputLayout->setSpacing(0);
+ pinInputLayout->addWidget(ui->pinInputAlert, 0, Qt::AlignRight);
ui->waitingSpinner->load(Application::isDarkTheme() ? u":/images/wait_dark.svg"_s
: u":/images/wait.svg"_s);
@@ -701,6 +711,7 @@ void WebEidDialog::showPinInputWarning(bool show)
{
style()->unpolish(ui->pinInput);
ui->pinInput->setProperty("warning", show);
+ ui->pinInputAlert->setVisible(show);
style()->polish(ui->pinInput);
}