Merge remote-tracking branch 'origin/develop' into travis/room-list/sublist-badges

2020-06-09 08:06:10 -06:00
parent 8632d56e97 d9bd3cfc38
commit 724f545b4a
22 changed files with 432 additions and 65 deletions
@@ -43,3 +43,7 @@ limitations under the License.
    padding-left: 20px;
    padding-right: 5px;
 }
+
+.mx_SettingsTab_customFontSizeField {
+    margin-left: calc($font-16px + 10px);
+}