Skip to content

Commit d7f4bd8

Browse files
metsmametsma
authored
Use fixed color (#1309)
IB-8325 Signed-off-by: Raul Metsma <[email protected]>
1 parent 2646a7a commit d7f4bd8

File tree

8 files changed

+12
-102
lines changed

8 files changed

+12
-102
lines changed

‎client/MainWindow.ui‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
<string>DigiDoc4 Client</string>
2121
</property>
2222
<property name="styleSheet">
23-
<string notr="true">#logo, #navBar {
23+
<string notr="true"> QLabel {
24+
color: #07142A;
25+
}
26+
#logo, #navBar {
2427
background-color: #003168;
2528
border-right: 1px solid #E7EAEF;
2629
}

‎client/dialogs/MobileDialog.ui‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
</property>
1919
<property name="styleSheet">
2020
<string notr="true">QWidget {
21+
color: #07142A;
2122
font-family: Roboto, Helvetica;
2223
font-size: 14px;
2324
}
@@ -30,24 +31,19 @@ color: #003168;
3031
font-size: 20px;
3132
font-weight: 700;
3233
}
33-
#labelCode, #labelPhone {
34-
color: #07142A;
35-
}
3634
#errorCode, #errorPhone {
3735
color: #AD2A45;
3836
}
3937
QLineEdit {
4038
padding: 10px 14px;
4139
border: 1px solid #C4CBD8;
4240
border-radius: 4px;
43-
color: #07142A;
4441
background-color: white;
4542
placeholder-text-color: #607496;
4643
font-size: 16px;
4744
}
4845
QCheckBox {
4946
spacing: 8px;
50-
color: #07142A;
5147
border: none; /*Workaround for right padding*/
5248
}
5349
QCheckBox:disabled {

‎client/dialogs/MobileProgress.ui‎

Lines changed: 1 addition & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
</property>
1616
<property name="styleSheet">
1717
<string notr="true">QWidget {
18+
color: #07142A;
1819
font-family: Roboto, Helvetica;
1920
font-size: 14px;
2021
}
@@ -27,84 +28,6 @@ color: #003168;
2728
font-size: 32px;
2829
font-weight: 700;
2930
}
30-
#label, #info {
31-
color: #07142A;
32-
}
33-
QLineEdit, QComboBox {
34-
padding: 10px 14px;
35-
border: 1px solid #C4CBD8;
36-
border-radius: 4px;
37-
color: #07142A;
38-
background-color: white;
39-
placeholder-text-color: #607496;
40-
font-size: 16px;
41-
}
42-
QComboBox QWidget#popup {
43-
background-color: transparent;
44-
}
45-
QComboBox QWidget#content {
46-
border: 1px solid #C4CBD8;
47-
border-radius: 4px;
48-
background-color: #FFFFFF;
49-
}
50-
QComboBox QPushButton {
51-
margin: 3px;
52-
padding: 0px 12px 0px 4px;
53-
border: 0px;
54-
color: #07142A;
55-
text-align: left;
56-
font-weight: normal;
57-
font-size: 16px;
58-
qproperty-iconSize: 14px 9px;
59-
qproperty-layoutDirection: RightToLeft;
60-
}
61-
QComboBox QPushButton#selected {
62-
qproperty-icon: url(:/images/arrow_up.svg);
63-
}
64-
QComboBox QPushButton:hover#selected {
65-
qproperty-icon: url(:/images/arrow_up_white.svg);
66-
}
67-
QComboBox::drop-down {
68-
background-color: #FFFFFF;
69-
width: 25px;
70-
}
71-
QComboBox::down-arrow {
72-
image: url(:/images/arrow_down.svg);
73-
}
74-
QComboBox::down-arrow:on {
75-
top: 1px;
76-
left: 1px;
77-
}
78-
QCheckBox {
79-
spacing: 8px;
80-
color: #07142A;
81-
border: none; /*Workaround for right padding*/
82-
}
83-
QCheckBox:disabled {
84-
color: #C4CBD8;
85-
}
86-
QCheckBox::indicator {
87-
width: 16px;
88-
height: 16px;
89-
}
90-
QCheckBox::indicator:unchecked {
91-
image: url(:/images/icon_checkbox.svg);
92-
}
93-
QCheckBox::indicator:unchecked:hover {
94-
image: url(:/images/icon_checkbox_active.svg);
95-
}
96-
QCheckBox::indicator:unchecked:disabled {
97-
image: url(:/images/icon_checkbox_disabled.svg);
98-
}
99-
QCheckBox::indicator:checked {
100-
image: url(:/images/icon_checkbox_check.svg);
101-
}
102-
QCheckBox::indicator:checked:hover {
103-
image: url(:/images/icon_checkbox_check_active.svg);
104-
}
105-
QCheckBox::indicator:checked:disabled {
106-
image: url(:/images/icon_checkbox_check_disabled.svg);
107-
}
10831
QPushButton {
10932
padding: 12px 12px;
11033
border-radius: 4px;

‎client/dialogs/PinPopup.ui‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
</property>
1616
<property name="styleSheet">
1717
<string notr="true">QWidget {
18+
color: #07142A;
1819
font-family: Roboto, Helvetica;
1920
font-size: 14px;
2021
}
@@ -27,23 +28,19 @@ color: #003168;
2728
font-size: 20px;
2829
font-weight: 700;
2930
}
30-
#labelPin {
31-
color: #07142A;
32-
}
3331
#errorPin {
3432
color: #AD2A45;
3533
}
3634
QLineEdit {
3735
padding: 10px 14px;
3836
border: 1px solid #C4CBD8;
3937
border-radius: 4px;
40-
color: #07142A;
4138
background-color: white;
4239
placeholder-text-color: #607496;
4340
font-size: 16px;
4441
}
4542
QPushButton {
46-
padding: 0px 12px;
43+
padding: 12px 12px;
4744
border-radius: 4px;
4845
border: 1px solid #AD2A45;
4946
color: #AD2A45;

‎client/dialogs/PinUnblock.ui‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
</property>
1616
<property name="styleSheet">
1717
<string notr="true">QWidget {
18+
color: #07142A;
1819
font-family: Roboto, Helvetica;
1920
font-size: 14px;
2021
}
@@ -27,17 +28,13 @@ color: #003168;
2728
font-size: 20px;
2829
font-weight: 700;
2930
}
30-
#labelPuk, #labelPin, #labelRepeat {
31-
color: #07142A;
32-
}
3331
#errorPuk, #errorPin, #errorRepeat {
3432
color: #AD2A45;
3533
}
3634
QLineEdit {
3735
padding: 10px 14px;
3836
border: 1px solid #C4CBD8;
3937
border-radius: 4px;
40-
color: #07142A;
4138
background-color: white;
4239
placeholder-text-color: #607496;
4340
font-size: 16px;

‎client/dialogs/RoleAddressDialog.ui‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
</property>
1616
<property name="styleSheet">
1717
<string notr="true">QWidget {
18+
color: #07142A;
1819
font-family: Roboto, Helvetica;
1920
font-size: 14px;
2021
}
@@ -27,17 +28,13 @@ color: #003168;
2728
font-size: 20px;
2829
font-weight: 700;
2930
}
30-
#RoleLabel, #CityLabel, #StateLabel, #CountryLabel, #ZipLabel {
31-
color: #07142A;
32-
}
3331
#errorCode, #errorCountry {
3432
color: #AD2A45;
3533
}
3634
QLineEdit {
3735
padding: 10px 14px;
3836
border: 1px solid #C4CBD8;
3937
border-radius: 4px;
40-
color: #07142A;
4138
background-color: white;
4239
placeholder-text-color: #607496;
4340
font-size: 16px;

‎client/dialogs/SettingsDialog.ui‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ QComboBox QPushButton {
386386
margin: 3px;
387387
padding: 0px 12px 0px 4px;
388388
border: 0px;
389+
color: #07142A;
389390
text-align: left;
390391
font-weight: normal;
391392
font-size: 16px;

‎client/dialogs/SmartIDDialog.ui‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
</property>
1919
<property name="styleSheet">
2020
<string notr="true">QWidget {
21+
color: #07142A;
2122
font-family: Roboto, Helvetica;
2223
font-size: 14px;
2324
}
@@ -30,17 +31,13 @@ color: #003168;
3031
font-size: 20px;
3132
font-weight: 700;
3233
}
33-
#labelCode, #labelCountry {
34-
color: #07142A;
35-
}
3634
#errorCode, #errorCountry {
3735
color: #AD2A45;
3836
}
3937
QLineEdit, QComboBox {
4038
padding: 10px 14px;
4139
border: 1px solid #C4CBD8;
4240
border-radius: 4px;
43-
color: #07142A;
4441
background-color: white;
4542
placeholder-text-color: #607496;
4643
font-size: 16px;
@@ -83,7 +80,6 @@ left: 1px;
8380
}
8481
QCheckBox {
8582
spacing: 8px;
86-
color: #07142A;
8783
border: none; /*Workaround for right padding*/
8884
}
8985
QCheckBox:disabled {

0 commit comments

Comments
 (0)