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

Keep widget URL in permission screen to one line

Browse source 
This keeps the widget URL to one line max, so that the allow button will always
be visible. The full URL can be viewed by hovering.

Fixes https://github.com/vector-im/riot-web/issues/10402
This commit is contained in:
J. Ryan Stinnett 2019-07-23 18:06:37 +01:00
parent 846a908bb4
commit 2d4264c39d
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
res/css/views/rooms/_AppsDrawer.scss
View file

@ -1,5 +1,6 @@
/* /*
Copyright 2015, 2016 OpenMarket Ltd Copyright 2015, 2016 OpenMarket Ltd
Copyright 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -310,7 +311,7 @@ form.mx_Custom_Widget_Form div {
} }
.mx_AppPermissionWarningText { .mx_AppPermissionWarningText {
max-width: 400px; max-width: 90%;
margin: 10px auto 10px auto; margin: 10px auto 10px auto;
color: $primary-fg-color; color: $primary-fg-color;
} }
@ -321,7 +322,12 @@ form.mx_Custom_Widget_Form div {
} }
.mx_AppPermissionWarningTextURL { .mx_AppPermissionWarningTextURL {
display: inline-block;
max-width: 100%;
color: $accent-color; color: $accent-color;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
.mx_AppPermissionButton { .mx_AppPermissionButton {

6
src/components/views/elements/AppPermission.js
View file

@ -1,6 +1,7 @@
/* /*
Copyright 2017 Vector Creations Ltd Copyright 2017 Vector Creations Ltd
Copyright 2018, 2019 New Vector Ltd Copyright 2018, 2019 New Vector Ltd
Copyright 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -67,7 +68,10 @@ export default class AppPermission extends React.Component {
<img src={require("../../../../res/img/feather-customised/warning-triangle.svg")} alt={_t('Warning!')} /> <img src={require("../../../../res/img/feather-customised/warning-triangle.svg")} alt={_t('Warning!')} />
</div> </div>
<div className='mx_AppPermissionWarningText'> <div className='mx_AppPermissionWarningText'>
<span className='mx_AppPermissionWarningTextLabel'>{ _t('Do you want to load widget from URL:') }</span> <span className='mx_AppPermissionWarningTextURL'>{ this.state.curlBase }</span> <span className='mx_AppPermissionWarningTextLabel'>{_t('Do you want to load widget from URL:')}</span>
<span className='mx_AppPermissionWarningTextURL'
title={this.state.curlBase}
>{this.state.curlBase}</span>
{ e2eWarningText } { e2eWarningText }
{ cookieWarning } { cookieWarning }
</div> </div>