Skip to content

Commit ce6074d

Browse files
metsmametsma
authored
Use correct fonts (#1383)
IB-7968 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent 9c5e37c commit ce6074d

File tree

14 files changed

+73
-75
lines changed

14 files changed

+73
-75
lines changed

‎COPYING‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ client/pkcs11.h
6161

6262

6363
_______________________________________________________________________________
64-
client/fonts/Open_Sans
64+
client/fonts
6565

6666
Apache License
6767
Version 2.0, January 2004

‎client/dialogs/CertificateDetails.ui‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,14 @@ font-size: 22px;
115115
</size>
116116
</property>
117117
<property name="styleSheet">
118-
<string notr="true">QHeaderView::section {
118+
<string notr="true">QTableWidget {
119+
background-color: #FFFFFF;
120+
}
121+
QTableWidget::item:selected {
122+
background-color: #E7EAEF;
123+
color: #07142A;
124+
}
125+
QHeaderView::section {
119126
border: 1px solid #E7EAEF;
120127
border-width: 0px 0px 1px 0px;
121128
padding: 0px 0px 8px 5px;

‎client/dialogs/CertificateHistory.ui‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ background-color: #FFFFFF;
7575
font-family: Roboto, Helvetica;
7676
font-size: 12px;
7777
color: #07142A;
78+
background-color: #FFFFFF;
7879
}
7980
QHeaderView::section {
8081
font-family: Roboto, Helvetica;
@@ -83,6 +84,10 @@ border: none;
8384
border-bottom: 1px solid #E7EAEF;
8485
background-color: #FFFFFF;
8586
}
87+
QTreeWidget::item:selected {
88+
background-color: #E7EAEF;
89+
color: #07142A;
90+
}
8691
QHeaderView::up-arrow,
8792
QHeaderView::down-arrow {
8893
subcontrol-origin: padding;
@@ -139,7 +144,7 @@ QHeaderView::down-arrow {
139144
<string>Expiry date</string>
140145
</property>
141146
<property name="textAlignment">
142-
<set>AlignCenter</set>
147+
<set>AlignLeading|AlignVCenter</set>
143148
</property>
144149
</column>
145150
</widget>

‎client/dialogs/FirstRun.ui‎

Lines changed: 34 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -113,65 +113,49 @@ color: #041E42;
113113
</property>
114114
<property name="styleSheet">
115115
<string notr="true">QComboBox {
116-
padding: 0px 10px;
117-
image: none;
118-
border: 1px solid #8E969D;
119-
border-radius: 2px;
120-
background-color: #FFFFFF;
121-
color: #353739;
122-
padding: 0px;
123-
padding-left:12px;
116+
padding: 0px 14px;
117+
border: 1px solid #C4CBD8;
118+
border-radius: 4px;
119+
background-color: #FFFFFF;
120+
color: #07142A;
121+
font-size: 16px;
124122
}
125-
126-
/* list */
127123
QComboBox QWidget#popup {
128-
background-color: transparent;
124+
background-color: transparent;
129125
}
130126
QComboBox QWidget#content {
131-
border: 1px solid #8E969D;
132-
border-radius: 2px;
133-
background-color: #FFFFFF;
127+
border: 1px solid #C4CBD8;
128+
border-radius: 4px;
129+
background-color: #FFFFFF;
134130
}
135-
136-
/* rows */
137131
QComboBox QPushButton {
138-
margin: 3px;
139-
padding: 0px 8px 0px 4px;
140-
border: 0px;
141-
color: #353739;
142-
background-color: #FFFFFF;
143-
text-align: left;
144-
qproperty-iconSize: 14px 9px;
145-
qproperty-layoutDirection: RightToLeft;
132+
margin: 3px;
133+
padding: 0px 12px 0px 4px;
134+
border: 0px;
135+
color: #07142A;
136+
background-color: #FFFFFF;
137+
text-align: left;
138+
font-weight: normal;
139+
font-size: 16px;
140+
qproperty-iconSize: 14px 9px;
141+
qproperty-layoutDirection: RightToLeft;
146142
}
147143
QComboBox QPushButton#selected {
148-
qproperty-icon: url(:/images/arrow_up.svg);
149-
}
150-
151-
/* hover row */
152-
QComboBox QPushButton:hover, QComboBox QPushButton:focus {
153-
background-color: #006EB5;
154-
color: #FFFFFF;
144+
qproperty-icon: url(:/images/arrow_up.svg);
155145
}
156146
QComboBox QPushButton:hover#selected, QComboBox QPushButton:focus#selected {
157-
qproperty-icon: url(:/images/arrow_up_white.svg);
147+
qproperty-icon: url(:/images/arrow_up_white.svg);
158148
}
159-
160-
/* drop-down button*/
161149
QComboBox::drop-down {
162-
background-color: #FFFFFF;
163-
width: 25px;
150+
background-color: #FFFFFF;
151+
width: 25px;
164152
}
165-
166-
/* drop-down button image*/
167153
QComboBox::down-arrow {
168-
image: url(:/images/arrow_down.svg);
154+
image: url(:/images/arrow_down.svg);
169155
}
170-
171-
/* drop-down button image on clicked*/
172156
QComboBox::down-arrow:on {
173-
top: 1px;
174-
left: 1px;
157+
top: 1px;
158+
left: 1px;
175159
}</string>
176160
</property>
177161
<property name="maxVisibleItems">
@@ -640,7 +624,7 @@ border-radius: 3px;</string>
640624
<x>363</x>
641625
<y>500</y>
642626
<width>298</width>
643-
<height>30</height>
627+
<height>32</height>
644628
</rect>
645629
</property>
646630
<property name="cursor">
@@ -657,9 +641,9 @@ border-radius: 3px;</string>
657641
<property name="geometry">
658642
<rect>
659643
<x>363</x>
660-
<y>535</y>
644+
<y>537</y>
661645
<width>298</width>
662-
<height>30</height>
646+
<height>32</height>
663647
</rect>
664648
</property>
665649
<property name="cursor">
@@ -1083,9 +1067,9 @@ border-radius: 3px;</string>
10831067
<property name="geometry">
10841068
<rect>
10851069
<x>363</x>
1086-
<y>535</y>
1070+
<y>537</y>
10871071
<width>298</width>
1088-
<height>30</height>
1072+
<height>32</height>
10891073
</rect>
10901074
</property>
10911075
<property name="cursor">
@@ -1104,7 +1088,7 @@ border-radius: 3px;</string>
11041088
<x>363</x>
11051089
<y>500</y>
11061090
<width>298</width>
1107-
<height>30</height>
1091+
<height>32</height>
11081092
</rect>
11091093
</property>
11101094
<property name="cursor">
@@ -1340,7 +1324,7 @@ border-radius: 3px;</string>
13401324
<x>363</x>
13411325
<y>500</y>
13421326
<width>298</width>
1343-
<height>30</height>
1327+
<height>32</height>
13441328
</rect>
13451329
</property>
13461330
<property name="cursor">

‎client/dialogs/KeyDialog.ui‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ background-color: #82A9D3;
8484
</property>
8585
<item>
8686
<widget class="QTreeWidget" name="view">
87+
<property name="styleSheet">
88+
<string notr="true">QWidget { background-color: #FFFFFF; }</string>
89+
</property>
8790
<property name="frameShape">
8891
<enum>QFrame::NoFrame</enum>
8992
</property>

‎client/dialogs/SettingsDialog.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ QLineEdit, QComboBox {
366366
padding: 10px 14px;
367367
border: 1px solid #C4CBD8;
368368
border-radius: 4px;
369-
background-color: white;
369+
background-color: #FFFFFF;
370370
placeholder-text-color: #607496;
371371
font-size: 16px;
372372
}

‎client/dialogs/SignatureDialog.ui‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,13 @@ text-decoration: underline;
436436
color: #2F70B6;
437437
border: none;
438438
}
439+
QTreeWidget {
440+
background-color: #FFFFFF;
441+
}
442+
QTreeWidget::item:selected {
443+
background-color: #E7EAEF;
444+
color: #07142A;
445+
}
439446
QHeaderView::section {
440447
font-family: Roboto, Helvetica;
441448
font-size: 14px;

‎client/dialogs/SmartIDDialog.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ QLineEdit, QComboBox {
3838
padding: 10px 14px;
3939
border: 1px solid #C4CBD8;
4040
border-radius: 4px;
41-
background-color: white;
41+
background-color: #FFFFFF;
4242
placeholder-text-color: #607496;
4343
font-size: 16px;
4444
}

‎client/translations/en.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,8 +1174,8 @@
11741174
</message>
11751175
<message>
11761176
<source>RECIPIENT_MESSAGE</source>
1177-
<translation>&lt;p align=center&gt;Who is recipient?&lt;/p&gt;
1178-
&lt;p align=center&gt;The recipient is a physical person or legal entity for whom the document can be encrypted. If the document is encrypted, only the specified recipient can see its content.&lt;/p&gt;</translation>
1177+
<translation>&lt;p align=&quot;left&quot;&gt;Who is recipient?&lt;/p&gt;
1178+
&lt;p align=&quot;left&quot;&gt;The recipient is a physical person or legal entity for whom the document can be encrypted. If the document is encrypted, only the specified recipient can see its content.&lt;/p&gt;</translation>
11791179
</message>
11801180
<message>
11811181
<source>Add recipients</source>

‎client/translations/et.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,8 +1174,8 @@
11741174
</message>
11751175
<message>
11761176
<source>RECIPIENT_MESSAGE</source>
1177-
<translation>&lt;p align=center&gt;Kes on adressaat?&lt;/p&gt;
1178-
&lt;p align=center&gt;Adressaat on füüsiline või juriidiline isik või asutus, kelle jaoks saab dokumendi krüpteerida. Kui dokument on krüpteeritud, siis saab ainult konkreetne adressaat selle sisu näha.&lt;/p&gt;</translation>
1177+
<translation>&lt;p align=&quot;left&quot;&gt;Kes on adressaat?&lt;/p&gt;
1178+
&lt;p align=&quot;left&quot;&gt;Adressaat on füüsiline või juriidiline isik või asutus, kelle jaoks saab dokumendi krüpteerida. Kui dokument on krüpteeritud, siis saab ainult konkreetne adressaat selle sisu näha.&lt;/p&gt;</translation>
11791179
</message>
11801180
<message>
11811181
<source>Add recipients</source>

0 commit comments

Comments
 (0)