From 4ec7a8ddffe0dc417bf6616a243bc2ea5d2a8ba1 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 19 Jun 2019 11:26:11 +0100 Subject: [PATCH 1/3] 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. --- res/css/_components.scss | 2 +- res/css/views/elements/_ToolTipButton.scss | 9 +++++---- src/components/structures/GroupView.js | 5 +++-- src/components/views/elements/ToolTipButton.js | 9 +++++---- src/components/views/rooms/EventTile.js | 5 +++-- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/res/css/_components.scss b/res/css/_components.scss index 843f314bd1..582dc59517 100644 --- a/res/css/_components.scss +++ b/res/css/_components.scss @@ -99,8 +99,8 @@ @import "./views/elements/_SyntaxHighlight.scss"; @import "./views/elements/_TextWithTooltip.scss"; @import "./views/elements/_ToggleSwitch.scss"; -@import "./views/elements/_ToolTipButton.scss"; @import "./views/elements/_Tooltip.scss"; +@import "./views/elements/_TooltipButton.scss"; @import "./views/elements/_Validation.scss"; @import "./views/globals/_MatrixToolbar.scss"; @import "./views/groups/_GroupPublicityToggle.scss"; diff --git a/res/css/views/elements/_ToolTipButton.scss b/res/css/views/elements/_ToolTipButton.scss index c496e67515..6ea36c800e 100644 --- a/res/css/views/elements/_ToolTipButton.scss +++ b/res/css/views/elements/_ToolTipButton.scss @@ -1,5 +1,6 @@ /* Copyright 2017 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. @@ -14,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -.mx_ToolTipButton { +.mx_TooltipButton { display: inline-block; width: 11px; height: 11px; @@ -33,17 +34,17 @@ limitations under the License. cursor: pointer; } -.mx_ToolTipButton:hover { +.mx_TooltipButton:hover { opacity: 1.0; } -.mx_ToolTipButton_container { +.mx_TooltipButton_container { position: relative; top: -18px; left: 4px; } -.mx_ToolTipButton_helpText { +.mx_TooltipButton_helpText { width: 400px; text-align: start; line-height: 17px !important; diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js index cdfbe26fea..7bf5400942 100644 --- a/src/components/structures/GroupView.js +++ b/src/components/structures/GroupView.js @@ -1,6 +1,7 @@ /* Copyright 2017 Vector Creations 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"); 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 TintableSvg = sdk.getComponent('elements.TintableSvg'); const Spinner = sdk.getComponent('elements.Spinner'); - const ToolTipButton = sdk.getComponent('elements.ToolTipButton'); + const TooltipButton = sdk.getComponent('elements.TooltipButton'); - const roomsHelpNode = this.state.editing ? :
; return ( -
+
? { tip }
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 9837b4a029..7d11ddac61 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -1,6 +1,7 @@ /* Copyright 2015, 2016 OpenMarket 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"); you may not use this file except in compliance with the License. @@ -670,13 +671,13 @@ module.exports = withMatrixClient(React.createClass({ {'requestLink': (sub) => { sub }}, ); - const ToolTipButton = sdk.getComponent('elements.ToolTipButton'); + const TooltipButton = sdk.getComponent('elements.TooltipButton'); const keyRequestInfo = isEncryptionFailure ?
{ keyRequestInfoContent } - +
: null; let reactionsRow; From ab4c5f0152a27d029e88aa52204dd57059dbdaab Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 19 Jun 2019 11:30:37 +0100 Subject: [PATCH 2/3] TooltipButton rename step 1 of 2 --- .../elements/{_ToolTipButton.scss => _TooltipButton.scss.tmp} | 0 .../views/elements/{ToolTipButton.js => TooltipButton.js.tmp} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename res/css/views/elements/{_ToolTipButton.scss => _TooltipButton.scss.tmp} (100%) rename src/components/views/elements/{ToolTipButton.js => TooltipButton.js.tmp} (100%) diff --git a/res/css/views/elements/_ToolTipButton.scss b/res/css/views/elements/_TooltipButton.scss.tmp similarity index 100% rename from res/css/views/elements/_ToolTipButton.scss rename to res/css/views/elements/_TooltipButton.scss.tmp diff --git a/src/components/views/elements/ToolTipButton.js b/src/components/views/elements/TooltipButton.js.tmp similarity index 100% rename from src/components/views/elements/ToolTipButton.js rename to src/components/views/elements/TooltipButton.js.tmp From bb4b5d779805d1cedd3af9ed071ef5dc96c6fe0e Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 19 Jun 2019 11:32:03 +0100 Subject: [PATCH 3/3] TooltipButton rename step 2 of 2 --- .../elements/{_TooltipButton.scss.tmp => _TooltipButton.scss} | 0 .../views/elements/{TooltipButton.js.tmp => TooltipButton.js} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename res/css/views/elements/{_TooltipButton.scss.tmp => _TooltipButton.scss} (100%) rename src/components/views/elements/{TooltipButton.js.tmp => TooltipButton.js} (100%) diff --git a/res/css/views/elements/_TooltipButton.scss.tmp b/res/css/views/elements/_TooltipButton.scss similarity index 100% rename from res/css/views/elements/_TooltipButton.scss.tmp rename to res/css/views/elements/_TooltipButton.scss diff --git a/src/components/views/elements/TooltipButton.js.tmp b/src/components/views/elements/TooltipButton.js similarity index 100% rename from src/components/views/elements/TooltipButton.js.tmp rename to src/components/views/elements/TooltipButton.js