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

Scale up settings UI to be easier to read #2604

Merged
merged 1 commit into from
Feb 11, 2019
Merged

Scale up settings UI to be easier to read #2604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 9 additions & 10 deletions res/css/structures/_TabbedView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ limitations under the License.
}

.mx_TabbedView_tabLabels {
width: 150px;
max-width: 150px;
width: 170px;
max-width: 170px;
color: $tab-label-fg-color;
position: fixed;
}
Expand All @@ -39,9 +39,8 @@ limitations under the License.
cursor: pointer;
display: block;
border-radius: 3px;
font-size: 12px;
font-weight: 600;
min-height: 20px; // use min-height instead of height to allow the label to overflow a bit
font-size: 14px;
min-height: 24px; // use min-height instead of height to allow the label to overflow a bit
margin-bottom: 6px;
position: relative;
}
Expand All @@ -55,18 +54,18 @@ limitations under the License.
margin-left: 6px;
margin-right: 9px;
margin-top: 1px;
width: 14px;
height: 14px;
width: 16px;
height: 16px;
display: inline-block;
}

.mx_TabbedView_maskedIcon:before {
display: inline-block;
background-color: $tab-label-icon-bg-color;
mask-repeat: no-repeat;
mask-size: 14px;
mask-size: 16px;
width: 14px;
height: 18px;
height: 22px;
mask-position: center;
content: '';
vertical-align: middle;
Expand All @@ -81,7 +80,7 @@ limitations under the License.
}

.mx_TabbedView_tabPanel {
margin-left: 220px; // 150px sidebar + 70px padding
margin-left: 240px; // 170px sidebar + 70px padding
flex-grow: 1;
display: flex;
flex-direction: column;
Expand Down
6 changes: 3 additions & 3 deletions res/css/views/dialogs/_SettingsDialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ limitations under the License.

.mx_SettingsDialog {
.mx_Dialog {
max-width: 900px;
width: 80%;
max-width: 1000px;
width: 90%;
height: 80%;
border-radius: 4px;
padding-top: 0;
Expand All @@ -30,7 +30,7 @@ limitations under the License.

.mx_TabbedView .mx_SettingsTab {
box-sizing: border-box;
min-width: 550px;
min-width: 580px;
padding-right: 130px;

// Put some padding on the bottom to avoid the settings tab from
Expand Down
8 changes: 4 additions & 4 deletions res/css/views/settings/tabs/_SettingsTab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
}

.mx_SettingsTab_subheading {
font-size: 14px;
font-size: 16px;
display: block;
font-family: $font-family;
font-weight: 600;
Expand All @@ -32,7 +32,7 @@ limitations under the License.

.mx_SettingsTab_subsectionText {
color: $settings-subsection-fg-color;
font-size: 12px;
font-size: 14px;
padding-bottom: 12px;
display: block;
margin: 0 100px 0 0; // Align with the rest of the view
Expand All @@ -45,9 +45,9 @@ limitations under the License.
}

.mx_SettingsTab_section .mx_SettingsFlag .mx_SettingsFlag_label {
vertical-align: bottom;
vertical-align: middle;
display: inline-block;
font-size: 12px;
font-size: 14px;
color: $primary-fg-color;
max-width: calc(100% - 48px); // Force word wrap instead of colliding with the switch
}
Expand Down