PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2604 from matrix-org/travis/settings/scale-up

Browse source 
Scale up settings UI to be easier to read
This commit is contained in:
Travis Ralston 2019-02-11 07:58:10 -07:00 committed by GitHub
commit e7e322d513
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
res/css/structures/_TabbedView.scss
View file

@ -28,8 +28,8 @@ limitations under the License.
} }
.mx_TabbedView_tabLabels { .mx_TabbedView_tabLabels {
width: 150px; width: 170px;
max-width: 150px; max-width: 170px;
color: $tab-label-fg-color; color: $tab-label-fg-color;
position: fixed; position: fixed;
} }
@ -39,9 +39,8 @@ limitations under the License.
cursor: pointer; cursor: pointer;
display: block; display: block;
border-radius: 3px; border-radius: 3px;
font-size: 12px; font-size: 14px;
font-weight: 600; min-height: 24px; // use min-height instead of height to allow the label to overflow a bit
min-height: 20px; // use min-height instead of height to allow the label to overflow a bit
margin-bottom: 6px; margin-bottom: 6px;
position: relative; position: relative;
} }
@ -55,8 +54,8 @@ limitations under the License.
margin-left: 6px; margin-left: 6px;
margin-right: 9px; margin-right: 9px;
margin-top: 1px; margin-top: 1px;
width: 14px; width: 16px;
height: 14px; height: 16px;
display: inline-block; display: inline-block;
} }
@ -64,9 +63,9 @@ limitations under the License.
display: inline-block; display: inline-block;
background-color: $tab-label-icon-bg-color; background-color: $tab-label-icon-bg-color;
mask-repeat: no-repeat; mask-repeat: no-repeat;
mask-size: 14px; mask-size: 16px;
width: 14px; width: 14px;
height: 18px; height: 22px;
mask-position: center; mask-position: center;
content: ''; content: '';
vertical-align: middle; vertical-align: middle;
@ -81,7 +80,7 @@ limitations under the License.
} }
.mx_TabbedView_tabPanel { .mx_TabbedView_tabPanel {
margin-left: 220px; // 150px sidebar + 70px padding margin-left: 240px; // 170px sidebar + 70px padding
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;

6
res/css/views/dialogs/_SettingsDialog.scss
View file

@ -16,8 +16,8 @@ limitations under the License.
.mx_SettingsDialog { .mx_SettingsDialog {
.mx_Dialog { .mx_Dialog {
max-width: 900px; max-width: 1000px;
width: 80%; width: 90%;
height: 80%; height: 80%;
border-radius: 4px; border-radius: 4px;
padding-top: 0; padding-top: 0;
@ -30,7 +30,7 @@ limitations under the License.
.mx_TabbedView .mx_SettingsTab { .mx_TabbedView .mx_SettingsTab {
box-sizing: border-box; box-sizing: border-box;
min-width: 550px; min-width: 580px;
padding-right: 130px; padding-right: 130px;
// Put some padding on the bottom to avoid the settings tab from // Put some padding on the bottom to avoid the settings tab from

8
res/css/views/settings/tabs/_SettingsTab.scss
View file

@ -21,7 +21,7 @@ limitations under the License.
} }
.mx_SettingsTab_subheading { .mx_SettingsTab_subheading {
font-size: 14px; font-size: 16px;
display: block; display: block;
font-family: $font-family; font-family: $font-family;
font-weight: 600; font-weight: 600;
@ -32,7 +32,7 @@ limitations under the License.
.mx_SettingsTab_subsectionText { .mx_SettingsTab_subsectionText {
color: $settings-subsection-fg-color; color: $settings-subsection-fg-color;
font-size: 12px; font-size: 14px;
padding-bottom: 12px; padding-bottom: 12px;
display: block; display: block;
margin: 0 100px 0 0; // Align with the rest of the view margin: 0 100px 0 0; // Align with the rest of the view
@ -45,9 +45,9 @@ limitations under the License.
} }
.mx_SettingsTab_section .mx_SettingsFlag .mx_SettingsFlag_label { .mx_SettingsTab_section .mx_SettingsFlag .mx_SettingsFlag_label {
vertical-align: bottom; vertical-align: middle;
display: inline-block; display: inline-block;
font-size: 12px; font-size: 14px;
color: $primary-fg-color; color: $primary-fg-color;
max-width: calc(100% - 48px); // Force word wrap instead of colliding with the switch max-width: calc(100% - 48px); // Force word wrap instead of colliding with the switch
} }