Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve the look of the keyboard settings tab #7562

Merged
merged 12 commits into from
Jan 24, 2022
Merged

Improve the look of the keyboard settings tab #7562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
014b6fe
First cut of new keyboard shortcuts
SimonBrandner Jan 17, 2022
aeaad9f
Merge remote-tracking branch 'upstream/develop' into feature/improved…
SimonBrandner Jan 19, 2022
d0fee5c
Remove unused code
SimonBrandner Jan 19, 2022
d8c86e8
i18n
SimonBrandner Jan 19, 2022
f00d991
Amend shortcuts
SimonBrandner Jan 19, 2022
6664ee0
Improve CATEGORIES struct
SimonBrandner Jan 19, 2022
ad391ad
Add tests for registerShortcut()
SimonBrandner Jan 19, 2022
688e9f3
Simplifie code tiny bit
SimonBrandner Jan 20, 2022
1d14361
Translate ALTERNATE_KEY_NAME
SimonBrandner Jan 20, 2022
4cd1a50
Fix `key` usage
SimonBrandner Jan 20, 2022
9e9f975
Export components for tests
SimonBrandner Jan 20, 2022
a0f3f75
Write snapshot tests
SimonBrandner Jan 20, 2022
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
32 changes: 4 additions & 28 deletions res/css/views/settings/tabs/user/_KeyboardUserSettingsTab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,10 @@ limitations under the License.
*/

.mx_KeyboardUserSettingsTab .mx_SettingsTab_section {
display: flex;
flex-wrap: wrap;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
flex-direction: column;
margin-bottom: -50px;
max-height: 1100px; // XXX: this may need adjusting when adding new shortcuts

.mx_KeyboardShortcutsDialog_category {
width: 33.3333%; // 3 columns
margin: 0 0 40px;

& > div {
padding-left: 5px;
}
}

h3 {
margin: 0 0 10px;
}

h5 {
margin: 15px 0 5px;
font-weight: normal;
.mx_KeyboardShortcut_shortcutRow {
display: flex;
justify-content: space-between;
align-items: center;
}

kbd {
Expand All @@ -59,8 +39,4 @@ limitations under the License.
margin-left: 5px;
}
}

.mx_KeyboardShortcutsDialog_inline div {
display: inline;
}
}
Loading