From ca93076d85c650056c26ff95eeb53b1ad45934d4 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 25 Jun 2022 11:55:04 +0000 Subject: [PATCH] Display description of E2E advanced panel as subsection text (#8889) --- res/css/_components.scss | 1 - res/css/views/settings/_E2eAdvancedPanel.scss | 19 ------------------- .../views/settings/E2eAdvancedPanel.tsx | 2 +- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 res/css/views/settings/_E2eAdvancedPanel.scss diff --git a/res/css/_components.scss b/res/css/_components.scss index f148766830..df5da0a158 100644 --- a/res/css/_components.scss +++ b/res/css/_components.scss @@ -280,7 +280,6 @@ @import "./views/settings/_CrossSigningPanel.scss"; @import "./views/settings/_CryptographyPanel.scss"; @import "./views/settings/_DevicesPanel.scss"; -@import "./views/settings/_E2eAdvancedPanel.scss"; @import "./views/settings/_EmailAddresses.scss"; @import "./views/settings/_FontScalingPanel.scss"; @import "./views/settings/_ImageSizePanel.scss"; diff --git a/res/css/views/settings/_E2eAdvancedPanel.scss b/res/css/views/settings/_E2eAdvancedPanel.scss deleted file mode 100644 index 3f180e6fcd..0000000000 --- a/res/css/views/settings/_E2eAdvancedPanel.scss +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2020 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. -*/ - -.mx_E2eAdvancedPanel_settingLongDescription { - margin-right: 150px; -} diff --git a/src/components/views/settings/E2eAdvancedPanel.tsx b/src/components/views/settings/E2eAdvancedPanel.tsx index ebb778deb4..e27c50dd8c 100644 --- a/src/components/views/settings/E2eAdvancedPanel.tsx +++ b/src/components/views/settings/E2eAdvancedPanel.tsx @@ -30,7 +30,7 @@ const E2eAdvancedPanel = props => { -
{ _t( +
{ _t( "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.", ) }
;