Make all 'font-size's and 'line-height's rem

Font size of the whole app would ideally be controlled by a single value. This value is currently hard coded using the :root CSS selector. It is the intention to make this value configurable within riot. In the interim all font-sizes have been converted to rem by the simple process of regex. Replacing px values with their equivalent rem values assuming a font size of 15px and then rounded to three decimal places, which was the base at the time of this transformation. I'm expecting another commit cleaning up rem values but I thought it best to leave that to review. This commit doesn't address any scaling issues. I thought it better to land this unwieldy, mechanical, invisible change before the others otherwise the pr would be impossible to review thoroughly.
2025-08-09 08:42:50 +03:00 · 2020-03-30 18:18:10 +01:00
parent cf4f595f79
commit da34e6241d
91 changed files with 230 additions and 226 deletions
--- a/res/css/views/dialogs/_AddressPickerDialog.scss
+++ b/res/css/views/dialogs/_AddressPickerDialog.scss
@@ -28,7 +28,7 @@ limitations under the License.
 .mx_AddressPickerDialog_input,
 .mx_AddressPickerDialog_input:focus {
    height: 26px;
-    font-size: 14px;
+    font-size: 0.933rem;
    font-family: $font-family;
    padding-left: 12px;
    padding-right: 12px;
@@ -50,7 +50,7 @@ limitations under the License.
 .mx_AddressPickerDialog_inputContainer {
    border-radius: 3px;
    border: solid 1px $input-border-color;
-    line-height: 36px;
+    line-height: 2.400rem;
    padding-left: 4px;
    padding-right: 4px;
    padding-top: 1px;
--- a/res/css/views/dialogs/_ConfirmUserActionDialog.scss
+++ b/res/css/views/dialogs/_ConfirmUserActionDialog.scss
@@ -26,22 +26,22 @@ limitations under the License.
 }

 .mx_ConfirmUserActionDialog_name {
-    font-size: 18px;
+    font-size: 1.2rem;
 }

 .mx_ConfirmUserActionDialog_userId {
-    font-size: 13px;
+    font-size: 0.867rem;
 }

 .mx_ConfirmUserActionDialog_reasonField {
    font-family: $font-family;
-    font-size: 14px;
+    font-size: 0.933rem;
    color: $primary-fg-color;
    background-color: $primary-bg-color;

    border-radius: 3px;
    border: solid 1px $input-border-color;
-    line-height: 36px;
+    line-height: 2.400rem;
    padding-left: 16px;
    padding-right: 16px;
    padding-top: 1px;
--- a/res/css/views/dialogs/_CreateGroupDialog.scss
+++ b/res/css/views/dialogs/_CreateGroupDialog.scss
@@ -25,7 +25,7 @@ limitations under the License.
 }

 .mx_CreateGroupDialog_input {
-    font-size: 15px;
+    font-size: 1rem;
    border-radius: 3px;
    border: 1px solid $input-border-color;
    padding: 9px;
@@ -44,7 +44,7 @@ limitations under the License.
 .mx_CreateGroupDialog_prefix,
 .mx_CreateGroupDialog_suffix {
    padding: 0px 5px;
-    line-height: 37px;
+    line-height: 2.467rem;
    background-color: $input-darker-bg-color;
    border: 1px solid $input-border-color;
    text-align: center;
--- a/res/css/views/dialogs/_CreateRoomDialog.scss
+++ b/res/css/views/dialogs/_CreateRoomDialog.scss
@@ -49,7 +49,7 @@ limitations under the License.
 }

 .mx_CreateRoomDialog_input {
-    font-size: 15px;
+    font-size: 1rem;
    border-radius: 3px;
    border: 1px solid $input-border-color;
    padding: 9px;
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -68,11 +68,11 @@ limitations under the License.
    width: 240px;
    color: $input-fg-color;
    font-family: $font-family;
-    font-size: 16px;
+    font-size: 1.067rem;
 }

 .mx_DevTools_textarea {
-    font-size: 12px;
+    font-size: 0.8rem;
    max-width: 684px;
    min-height: 250px;
    padding: 10px;
--- a/res/css/views/dialogs/_InviteDialog.scss
+++ b/res/css/views/dialogs/_InviteDialog.scss
@@ -40,8 +40,8 @@ limitations under the License.
        textarea,
        textarea:focus {
            height: 34px;
-            line-height: 34px;
-            font-size: 14px;
+            line-height: 2.267rem;
+            font-size: 0.933rem;
            padding-left: 12px;
            margin: 0 !important;
            border: 0 !important;
@@ -65,7 +65,7 @@ limitations under the License.
        min-width: 48px;
        margin-left: 10px;
        height: 25px;
-        line-height: 25px;
+        line-height: 1.667rem;
    }

    .mx_InviteDialog_buttonAndSpinner {
@@ -84,7 +84,7 @@ limitations under the License.
    padding-bottom: 10px;

    h3 {
-        font-size: 12px;
+        font-size: 0.8rem;
        color: $muted-fg-color;
        font-weight: bold;
        text-transform: uppercase;
@@ -143,23 +143,23 @@ limitations under the License.

    .mx_InviteDialog_roomTile_name {
        font-weight: 600;
-        font-size: 14px;
+        font-size: 0.933rem;
        color: $primary-fg-color;
        margin-left: 7px;
    }

    .mx_InviteDialog_roomTile_userId {
-        font-size: 12px;
+        font-size: 0.8rem;
        color: $muted-fg-color;
        margin-left: 7px;
    }

    .mx_InviteDialog_roomTile_time {
        text-align: right;
-        font-size: 12px;
+        font-size: 0.8rem;
        color: $muted-fg-color;
        float: right;
-        line-height: 36px; // Height of the avatar to keep the time vertically aligned
+        line-height: 2.400rem; // Height of the avatar to keep the time vertically aligned
    }

    .mx_InviteDialog_roomTile_highlight {
@@ -176,7 +176,7 @@ limitations under the License.
        border-radius: 12px;
        display: inline-block;
        height: 24px;
-        line-height: 24px;
+        line-height: 1.600rem;
        padding-left: 8px;
        padding-right: 8px;
        color: #ffffff; // this is fine without a var because it's for both themes
--- a/res/css/views/dialogs/_MessageEditHistoryDialog.scss
+++ b/res/css/views/dialogs/_MessageEditHistoryDialog.scss
@@ -35,7 +35,7 @@ limitations under the License.

 .mx_MessageEditHistoryDialog_edits {
    list-style-type: none;
-    font-size: 14px;
+    font-size: 0.933rem;
    padding: 0;
    color: $primary-fg-color;

@@ -60,7 +60,7 @@ limitations under the License.
    }

    .mx_MessageActionBar .mx_AccessibleButton {
-        font-size: 10px;
+        font-size: 0.667rem;
        padding: 0 8px;
    }
 }
--- a/res/css/views/dialogs/_NewSessionReviewDialog.scss
+++ b/res/css/views/dialogs/_NewSessionReviewDialog.scss
@@ -32,6 +32,6 @@ limitations under the License.
 }

 .mx_NewSessionReviewDialog_deviceID {
-    font-size: 12px;
+    font-size: 0.8rem;
    color: $notice-secondary-color;
 }
--- a/res/css/views/dialogs/_SetEmailDialog.scss
+++ b/res/css/views/dialogs/_SetEmailDialog.scss
@@ -20,7 +20,7 @@ limitations under the License.
    padding: 9px;
    color: $input-fg-color;
    background-color: $primary-bg-color;
-    font-size: 15px;
+    font-size: 1rem;
    width: 100%;
    max-width: 280px;
    margin-bottom: 10px;
--- a/res/css/views/dialogs/_SetMxIdDialog.scss
+++ b/res/css/views/dialogs/_SetMxIdDialog.scss
@@ -29,7 +29,7 @@ limitations under the License.
    padding: 9px;
    color: $primary-fg-color;
    background-color: $primary-bg-color;
-    font-size: 15px;
+    font-size: 1rem;
    width: 100%;
    max-width: 280px;
 }
--- a/res/css/views/dialogs/_SetPasswordDialog.scss
+++ b/res/css/views/dialogs/_SetPasswordDialog.scss
@@ -20,7 +20,7 @@ limitations under the License.
    padding: 9px;
    color: $primary-fg-color;
    background-color: $primary-bg-color;
-    font-size: 15px;
+    font-size: 1rem;
    max-width: 280px;
    margin-bottom: 10px;
 }
--- a/res/css/views/dialogs/_TermsDialog.scss
+++ b/res/css/views/dialogs/_TermsDialog.scss
@@ -31,7 +31,7 @@ limitations under the License.
 }

 .mx_TermsDialog_termsTable {
-    font-size: 12px;
+    font-size: 0.8rem;
    width: 100%;
 }

--- a/res/css/views/dialogs/_UnknownDeviceDialog.scss
+++ b/res/css/views/dialogs/_UnknownDeviceDialog.scss
@@ -27,7 +27,7 @@ limitations under the License.
 // userid
 .mx_UnknownDeviceDialog p {
    font-weight: bold;
-    font-size: 16px;
+    font-size: 1.067rem;
 }

 .mx_UnknownDeviceDialog .mx_DeviceVerifyButtons {