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

Convert CryptographyPanel to a table #6968

Merged
merged 2 commits into from
Oct 18, 2021
Merged

Convert CryptographyPanel to a table #6968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13d6456
Convert CryptographyPanel to a table
andybalaam Oct 15, 2021
61a5b49
Remove duplicate CSS selector
andybalaam Oct 18, 2021
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
17 changes: 9 additions & 8 deletions res/css/views/settings/_CryptographyPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
.mx_CryptographyPanel_sessionInfo {
display: table;
padding-left: 0;
padding: 0em;
border-spacing: 0px;
}

.mx_CryptographyPanel_sessionInfo > li {
display: table-row;
.mx_CryptographyPanel_sessionInfo > tr {
vertical-align: baseline;
padding: 0em;
}

.mx_CryptographyPanel_sessionInfo > li > label,
.mx_CryptographyPanel_sessionInfo > li > span {
display: table-cell;
.mx_CryptographyPanel_sessionInfo > tr > td {
padding-bottom: 0em;
padding-left: 0em;
padding-right: 1em;
padding-top: 0em;
}

.mx_CryptographyPanel_importExportButtons .mx_AccessibleButton {
Expand Down
20 changes: 10 additions & 10 deletions src/components/views/settings/CryptographyPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,16 @@ export default class CryptographyPanel extends React.Component<IProps, IState> {
return (
<div className='mx_SettingsTab_section mx_CryptographyPanel'>
<span className='mx_SettingsTab_subheading'>{ _t("Cryptography") }</span>
<ul className='mx_SettingsTab_subsectionText mx_CryptographyPanel_sessionInfo'>
<li>
<label>{ _t("Session ID:") }</label>
<span><code>{ deviceId }</code></span>
</li>
<li>
<label>{ _t("Session key:") }</label>
<span><code><b>{ identityKey }</b></code></span>
</li>
</ul>
<table className='mx_SettingsTab_subsectionText mx_CryptographyPanel_sessionInfo'>
<tr>
<td>{ _t("Session ID:") }</td>
<td><code>{ deviceId }</code></td>
</tr>
<tr>
<td>{ _t("Session key:") }</td>
<td><code><b>{ identityKey }</b></code></td>
</tr>
</table>
{ importExportButtons }
{ noSendUnverifiedSetting }
</div>
Expand Down