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

Don't set font-family explicitly #6272

Merged
merged 4 commits into from
Jul 27, 2021
Merged

Don't set font-family explicitly #6272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbe3eb7
Remove unused class
SimonBrandner Jun 26, 2021
ffc6f96
Remove explicitly set font-family
SimonBrandner Jun 26, 2021
ed78bd9
Remove explicitly set font-family in place where comments talk about FF
SimonBrandner Jun 26, 2021
43732e5
Inherit font-family
SimonBrandner Jun 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions res/css/_common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ a:visited {
input[type=text],
input[type=search],
input[type=password] {
font-family: inherit;
padding: 9px;
font-family: $font-family;
font-size: $font-14px;
font-weight: 600;
min-width: 0;
Expand Down Expand Up @@ -146,7 +146,6 @@ input[type=text], input[type=password], textarea {

/* Required by Firefox */
textarea {
font-family: $font-family;
color: $primary-fg-color;
}

Expand Down
1 change: 0 additions & 1 deletion res/css/views/dialogs/_AddressPickerDialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ limitations under the License.
.mx_AddressPickerDialog_input:focus {
height: 26px;
font-size: $font-14px;
font-family: $font-family;
padding-left: 12px;
padding-right: 12px;
margin: 0 !important;
Expand Down
1 change: 0 additions & 1 deletion res/css/views/dialogs/_ConfirmUserActionDialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ limitations under the License.
}

.mx_ConfirmUserActionDialog_reasonField {
font-family: $font-family;
font-size: $font-14px;
color: $primary-fg-color;
background-color: $primary-bg-color;
Expand Down
17 changes: 0 additions & 17 deletions res/css/views/dialogs/_DevtoolsDialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,6 @@ limitations under the License.
padding-right: 24px;
}

.mx_DevTools_inputCell {
display: table-cell;
width: 240px;
}

.mx_DevTools_inputCell input {
display: inline-block;
border: 0;
border-bottom: 1px solid $input-underline-color;
padding: 0;
width: 240px;
color: $input-fg-color;
font-family: $font-family;
font-size: $font-16px;
}

.mx_DevTools_textarea {
font-size: $font-12px;
max-width: 684px;
Expand Down Expand Up @@ -139,7 +123,6 @@ limitations under the License.
+ .mx_DevTools_tgl-btn {
padding: 2px;
transition: all .2s ease;
font-family: sans-serif;
perspective: 100px;
&::after,
&::before {
Expand Down
1 change: 0 additions & 1 deletion res/css/views/elements/_Field.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ limitations under the License.
.mx_Field select,
.mx_Field textarea {
font-weight: normal;
font-family: $font-family;
font-size: $font-14px;
border: none;
// Even without a border here, we still need this avoid overlapping the rounded
Expand Down
2 changes: 0 additions & 2 deletions res/css/views/rooms/_MessageComposer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,6 @@ limitations under the License.
font-size: $font-14px;
max-height: 120px;
overflow: auto;
/* needed for FF */
font-family: $font-family;
}

/* hack for FF as vertical alignment of custom placeholder text is broken */
Expand Down
1 change: 0 additions & 1 deletion res/css/views/settings/tabs/_SettingsTab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ limitations under the License.
.mx_SettingsTab_subheading {
font-size: $font-16px;
display: block;
font-family: $font-family;
font-weight: 600;
color: $primary-fg-color;
margin-bottom: 10px;
Expand Down