Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 9707797

Browse files
authored
Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163
Don't set `font-family` explicitly
2 parents f82744d + 43732e5 commit 9707797

File tree

7 files changed

+1
-25
lines changed

7 files changed

+1
-25
lines changed

res/css/_common.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ a:visited {
104104
input[type=text],
105105
input[type=search],
106106
input[type=password] {
107+
font-family: inherit;
107108
padding: 9px;
108-
font-family: $font-family;
109109
font-size: $font-14px;
110110
font-weight: 600;
111111
min-width: 0;
@@ -146,7 +146,6 @@ input[type=text], input[type=password], textarea {
146146

147147
/* Required by Firefox */
148148
textarea {
149-
font-family: $font-family;
150149
color: $primary-fg-color;
151150
}
152151

res/css/views/dialogs/_AddressPickerDialog.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ limitations under the License.
2929
.mx_AddressPickerDialog_input:focus {
3030
height: 26px;
3131
font-size: $font-14px;
32-
font-family: $font-family;
3332
padding-left: 12px;
3433
padding-right: 12px;
3534
margin: 0 !important;

res/css/views/dialogs/_ConfirmUserActionDialog.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ limitations under the License.
3434
}
3535

3636
.mx_ConfirmUserActionDialog_reasonField {
37-
font-family: $font-family;
3837
font-size: $font-14px;
3938
color: $primary-fg-color;
4039
background-color: $primary-bg-color;

res/css/views/dialogs/_DevtoolsDialog.scss

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,6 @@ limitations under the License.
5555
padding-right: 24px;
5656
}
5757

58-
.mx_DevTools_inputCell {
59-
display: table-cell;
60-
width: 240px;
61-
}
62-
63-
.mx_DevTools_inputCell input {
64-
display: inline-block;
65-
border: 0;
66-
border-bottom: 1px solid $input-underline-color;
67-
padding: 0;
68-
width: 240px;
69-
color: $input-fg-color;
70-
font-family: $font-family;
71-
font-size: $font-16px;
72-
}
73-
7458
.mx_DevTools_textarea {
7559
font-size: $font-12px;
7660
max-width: 684px;
@@ -139,7 +123,6 @@ limitations under the License.
139123
+ .mx_DevTools_tgl-btn {
140124
padding: 2px;
141125
transition: all .2s ease;
142-
font-family: sans-serif;
143126
perspective: 100px;
144127
&::after,
145128
&::before {

res/css/views/elements/_Field.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ limitations under the License.
3939
.mx_Field select,
4040
.mx_Field textarea {
4141
font-weight: normal;
42-
font-family: $font-family;
4342
font-size: $font-14px;
4443
border: none;
4544
// Even without a border here, we still need this avoid overlapping the rounded

res/css/views/rooms/_MessageComposer.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,6 @@ limitations under the License.
165165
font-size: $font-14px;
166166
max-height: 120px;
167167
overflow: auto;
168-
/* needed for FF */
169-
font-family: $font-family;
170168
}
171169

172170
/* hack for FF as vertical alignment of custom placeholder text is broken */

res/css/views/settings/tabs/_SettingsTab.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ limitations under the License.
3636
.mx_SettingsTab_subheading {
3737
font-size: $font-16px;
3838
display: block;
39-
font-family: $font-family;
4039
font-weight: 600;
4140
color: $primary-fg-color;
4241
margin-bottom: 10px;

0 commit comments

Comments
 (0)