OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/28217/head
RiotRobot 2022-06-14 14:21:33 +01:00
parent 045d895f1c 1dee39f419
commit 7d14d15ba6
2 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
res/css/views/settings/tabs/user/_HelpUserSettingsTab.scss
View File

@ -15,16 +15,17 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
.mx_HelpUserSettingsTab_debugButton { .mx_HelpUserSettingsTab {
margin-bottom: 5px; code {
margin-top: 5px;
}
.mx_HelpUserSettingsTab span.mx_AccessibleButton {
word-break: break-word;
}
.mx_HelpUserSettingsTab code {
word-break: break-all; word-break: break-all;
user-select: all; user-select: all;
} }
details {
margin: $spacing-16 auto;
summary {
margin-bottom: $spacing-16;
}
}
}

23
src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
View File

@ -110,7 +110,7 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
} }
return ( return (
<div className='mx_SettingsTab_section mx_HelpUserSettingsTab_versions'> <div className='mx_SettingsTab_section'>
<span className='mx_SettingsTab_subheading'>{ _t("Legal") }</span> <span className='mx_SettingsTab_subheading'>{ _t("Legal") }</span>
<div className='mx_SettingsTab_subsectionText'> <div className='mx_SettingsTab_subsectionText'>
{ legalLinks } { legalLinks }
@ -125,7 +125,7 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
return ( return (
<div className='mx_SettingsTab_section'> <div className='mx_SettingsTab_section'>
<span className='mx_SettingsTab_subheading'>{ _t("Credits") }</span> <span className='mx_SettingsTab_subheading'>{ _t("Credits") }</span>
<ul> <ul className='mx_SettingsTab_subsectionText'>
<li> <li>
The <a href="themes/element/img/backgrounds/lake.jpg" rel="noreferrer noopener" target="_blank"> The <a href="themes/element/img/backgrounds/lake.jpg" rel="noreferrer noopener" target="_blank">
default cover photo default cover photo
@ -245,11 +245,11 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
"last interacted with, and the usernames of other users. " + "last interacted with, and the usernames of other users. " +
"They do not contain messages.", "They do not contain messages.",
) } ) }
<div className='mx_HelpUserSettingsTab_debugButton'> </div>
<AccessibleButton onClick={this.onBugReport} kind='primary'> <AccessibleButton onClick={this.onBugReport} kind='primary'>
{ _t("Submit debug logs") } { _t("Submit debug logs") }
</AccessibleButton> </AccessibleButton>
</div> <div className='mx_SettingsTab_subsectionText'>
{ _t( { _t(
"To report a Matrix-related security issue, please read the Matrix.org " + "To report a Matrix-related security issue, please read the Matrix.org " +
"<a>Security Disclosure Policy</a>.", {}, "<a>Security Disclosure Policy</a>.", {},
@ -280,7 +280,7 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
{ _t("Keyboard Shortcuts") } { _t("Keyboard Shortcuts") }
</AccessibleButton> </AccessibleButton>
</div> </div>
<div className='mx_SettingsTab_section mx_HelpUserSettingsTab_versions'> <div className='mx_SettingsTab_section'>
<span className='mx_SettingsTab_subheading'>{ _t("Versions") }</span> <span className='mx_SettingsTab_subheading'>{ _t("Versions") }</span>
<div className='mx_SettingsTab_subsectionText'> <div className='mx_SettingsTab_subsectionText'>
<CopyableText getTextToCopy={this.getVersionTextToCopy}> <CopyableText getTextToCopy={this.getVersionTextToCopy}>
@ -292,28 +292,25 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
</div> </div>
{ this.renderLegal() } { this.renderLegal() }
{ this.renderCredits() } { this.renderCredits() }
<div className='mx_SettingsTab_section mx_HelpUserSettingsTab_versions'> <div className='mx_SettingsTab_section'>
<span className='mx_SettingsTab_subheading'>{ _t("Advanced") }</span> <span className='mx_SettingsTab_subheading'>{ _t("Advanced") }</span>
<div className='mx_SettingsTab_subsectionText'> <div className='mx_SettingsTab_subsectionText'>
{ _t("Homeserver is") } <code>{ MatrixClientPeg.get().getHomeserverUrl() }</code><br /> <div>{ _t("Homeserver is") } <code>{ MatrixClientPeg.get().getHomeserverUrl() }</code></div>
{ _t("Identity server is") } <code>{ MatrixClientPeg.get().getIdentityServerUrl() }</code><br /> <div>{ _t("Identity server is") } <code>{ MatrixClientPeg.get().getIdentityServerUrl() }</code></div>
<br />
<details> <details>
<summary>{ _t("Access Token") }</summary><br /> <summary>{ _t("Access Token") }</summary>
<b>{ _t("Your access token gives full access to your account." <b>{ _t("Your access token gives full access to your account."
+ " Do not share it with anyone.") }</b> + " Do not share it with anyone.") }</b>
<CopyableText getTextToCopy={() => MatrixClientPeg.get().getAccessToken()}> <CopyableText getTextToCopy={() => MatrixClientPeg.get().getAccessToken()}>
{ MatrixClientPeg.get().getAccessToken() } { MatrixClientPeg.get().getAccessToken() }
</CopyableText> </CopyableText>
</details><br /> </details>
<div className='mx_HelpUserSettingsTab_debugButton'>
<AccessibleButton onClick={this.onClearCacheAndReload} kind='danger'> <AccessibleButton onClick={this.onClearCacheAndReload} kind='danger'>
{ _t("Clear cache and reload") } { _t("Clear cache and reload") }
</AccessibleButton> </AccessibleButton>
</div> </div>
</div> </div>
</div> </div>
</div>
); );
} }
} }