Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Keep widget URL in permission screen to one line #3243

Merged
merged 2 commits into from
Jul 25, 2019
Merged

Keep widget URL in permission screen to one line #3243

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
846a908
Add missing copyright header
jryans Jul 23, 2019
2d4264c
Keep widget URL in permission screen to one line
jryans Jul 23, 2019
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
8 changes: 7 additions & 1 deletion res/css/views/rooms/_AppsDrawer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2019 The Matrix.org Foundation C.I.C.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -310,7 +311,7 @@ form.mx_Custom_Widget_Form div {
}

.mx_AppPermissionWarningText {
max-width: 400px;
max-width: 90%;
margin: 10px auto 10px auto;
color: $primary-fg-color;
}
Expand All @@ -321,7 +322,12 @@ form.mx_Custom_Widget_Form div {
}

.mx_AppPermissionWarningTextURL {
display: inline-block;
max-width: 100%;
color: $accent-color;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}

.mx_AppPermissionButton {
Expand Down
23 changes: 22 additions & 1 deletion src/components/views/elements/AppPermission.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
/*
Copyright 2017 Vector Creations 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");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import React from 'react';
import PropTypes from 'prop-types';
import url from 'url';
Expand Down Expand Up @@ -50,7 +68,10 @@ export default class AppPermission extends React.Component {
<img src={require("../../../../res/img/feather-customised/warning-triangle.svg")} alt={_t('Warning!')} />
</div>
<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 }
{ cookieWarning }
</div>
Expand Down