Fix casing of TooltipButton
My brain can't deal with two different ways to write "Tooltip", so this converges the naming to match the rest of the code base. Separate commits will fix up the file names for case-insensitive file systems.
This commit is contained in:
parent
bb97653455
commit
4ec7a8ddff
5 changed files with 17 additions and 13 deletions
|
@ -99,8 +99,8 @@
|
||||||
@import "./views/elements/_SyntaxHighlight.scss";
|
@import "./views/elements/_SyntaxHighlight.scss";
|
||||||
@import "./views/elements/_TextWithTooltip.scss";
|
@import "./views/elements/_TextWithTooltip.scss";
|
||||||
@import "./views/elements/_ToggleSwitch.scss";
|
@import "./views/elements/_ToggleSwitch.scss";
|
||||||
@import "./views/elements/_ToolTipButton.scss";
|
|
||||||
@import "./views/elements/_Tooltip.scss";
|
@import "./views/elements/_Tooltip.scss";
|
||||||
|
@import "./views/elements/_TooltipButton.scss";
|
||||||
@import "./views/elements/_Validation.scss";
|
@import "./views/elements/_Validation.scss";
|
||||||
@import "./views/globals/_MatrixToolbar.scss";
|
@import "./views/globals/_MatrixToolbar.scss";
|
||||||
@import "./views/groups/_GroupPublicityToggle.scss";
|
@import "./views/groups/_GroupPublicityToggle.scss";
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
/*
|
/*
|
||||||
Copyright 2017 New Vector Ltd.
|
Copyright 2017 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.
|
||||||
|
@ -14,7 +15,7 @@ See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.mx_ToolTipButton {
|
.mx_TooltipButton {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: 11px;
|
width: 11px;
|
||||||
height: 11px;
|
height: 11px;
|
||||||
|
@ -33,17 +34,17 @@ limitations under the License.
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_ToolTipButton:hover {
|
.mx_TooltipButton:hover {
|
||||||
opacity: 1.0;
|
opacity: 1.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_ToolTipButton_container {
|
.mx_TooltipButton_container {
|
||||||
position: relative;
|
position: relative;
|
||||||
top: -18px;
|
top: -18px;
|
||||||
left: 4px;
|
left: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_ToolTipButton_helpText {
|
.mx_TooltipButton_helpText {
|
||||||
width: 400px;
|
width: 400px;
|
||||||
text-align: start;
|
text-align: start;
|
||||||
line-height: 17px !important;
|
line-height: 17px !important;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright 2017 Vector Creations Ltd.
|
Copyright 2017 Vector Creations Ltd.
|
||||||
Copyright 2017, 2018 New Vector Ltd.
|
Copyright 2017, 2018 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.
|
||||||
|
@ -861,9 +862,9 @@ export default React.createClass({
|
||||||
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
|
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
|
||||||
const TintableSvg = sdk.getComponent('elements.TintableSvg');
|
const TintableSvg = sdk.getComponent('elements.TintableSvg');
|
||||||
const Spinner = sdk.getComponent('elements.Spinner');
|
const Spinner = sdk.getComponent('elements.Spinner');
|
||||||
const ToolTipButton = sdk.getComponent('elements.ToolTipButton');
|
const TooltipButton = sdk.getComponent('elements.TooltipButton');
|
||||||
|
|
||||||
const roomsHelpNode = this.state.editing ? <ToolTipButton helpText={
|
const roomsHelpNode = this.state.editing ? <TooltipButton helpText={
|
||||||
_t(
|
_t(
|
||||||
'These rooms are displayed to community members on the community page. '+
|
'These rooms are displayed to community members on the community page. '+
|
||||||
'Community members can join the rooms by clicking on them.',
|
'Community members can join the rooms by clicking on them.',
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
/*
|
/*
|
||||||
Copyright 2017 New Vector Ltd.
|
Copyright 2017 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.
|
||||||
|
@ -18,7 +19,7 @@ import React from 'react';
|
||||||
import sdk from '../../../index';
|
import sdk from '../../../index';
|
||||||
|
|
||||||
module.exports = React.createClass({
|
module.exports = React.createClass({
|
||||||
displayName: 'ToolTipButton',
|
displayName: 'TooltipButton',
|
||||||
|
|
||||||
getInitialState: function() {
|
getInitialState: function() {
|
||||||
return {
|
return {
|
||||||
|
@ -41,12 +42,12 @@ module.exports = React.createClass({
|
||||||
render: function() {
|
render: function() {
|
||||||
const Tooltip = sdk.getComponent("elements.Tooltip");
|
const Tooltip = sdk.getComponent("elements.Tooltip");
|
||||||
const tip = this.state.hover ? <Tooltip
|
const tip = this.state.hover ? <Tooltip
|
||||||
className="mx_ToolTipButton_container"
|
className="mx_TooltipButton_container"
|
||||||
tooltipClassName="mx_ToolTipButton_helpText"
|
tooltipClassName="mx_TooltipButton_helpText"
|
||||||
label={this.props.helpText}
|
label={this.props.helpText}
|
||||||
/> : <div />;
|
/> : <div />;
|
||||||
return (
|
return (
|
||||||
<div className="mx_ToolTipButton" onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut} >
|
<div className="mx_TooltipButton" onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut} >
|
||||||
?
|
?
|
||||||
{ tip }
|
{ tip }
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright 2015, 2016 OpenMarket Ltd
|
Copyright 2015, 2016 OpenMarket Ltd
|
||||||
Copyright 2017 New Vector Ltd
|
Copyright 2017 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.
|
||||||
|
@ -670,13 +671,13 @@ module.exports = withMatrixClient(React.createClass({
|
||||||
{'requestLink': (sub) => <a onClick={this.onRequestKeysClick}>{ sub }</a>},
|
{'requestLink': (sub) => <a onClick={this.onRequestKeysClick}>{ sub }</a>},
|
||||||
);
|
);
|
||||||
|
|
||||||
const ToolTipButton = sdk.getComponent('elements.ToolTipButton');
|
const TooltipButton = sdk.getComponent('elements.TooltipButton');
|
||||||
const keyRequestInfo = isEncryptionFailure ?
|
const keyRequestInfo = isEncryptionFailure ?
|
||||||
<div className="mx_EventTile_keyRequestInfo">
|
<div className="mx_EventTile_keyRequestInfo">
|
||||||
<span className="mx_EventTile_keyRequestInfo_text">
|
<span className="mx_EventTile_keyRequestInfo_text">
|
||||||
{ keyRequestInfoContent }
|
{ keyRequestInfoContent }
|
||||||
</span>
|
</span>
|
||||||
<ToolTipButton helpText={keyRequestHelpText} />
|
<TooltipButton helpText={keyRequestHelpText} />
|
||||||
</div> : null;
|
</div> : null;
|
||||||
|
|
||||||
let reactionsRow;
|
let reactionsRow;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue