Skip to content
This repository was archived by the owner on May 18, 2025. It is now read-only.

Commit a996499

Browse files
committed
merge fpierfed/develop
1 parent 4a41839 commit a996499

File tree

18 files changed

+9
-182
lines changed

18 files changed

+9
-182
lines changed

res/css/structures/_ToastContainer.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ limitations under the License.
134134
.mx_Toast_buttons {
135135
float: right;
136136
display: flex;
137-
gap: 5px;
138137

139138
.mx_AccessibleButton {
140139
min-width: 96px;

res/css/views/right_panel/_UserInfo.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ limitations under the License.
3737
height: 16px;
3838
width: 16px;
3939
padding: 4px;
40-
mask-image: url("$(res)/img/minimise.svg");
40+
mask-image: url('$(res)/img/minimise.svg');
4141
mask-repeat: no-repeat;
4242
mask-position: 7px center;
4343
background-color: $rightpanel-button-color;
@@ -55,7 +55,7 @@ limitations under the License.
5555
}
5656

5757
.mx_UserInfo_separator {
58-
border-bottom: 1px solid rgba($primary-fg-color, 0.1);
58+
border-bottom: 1px solid rgba($primary-fg-color, .1);
5959
}
6060

6161
.mx_UserInfo_memberDetailsContainer {
@@ -223,6 +223,7 @@ limitations under the License.
223223
display: flex;
224224
margin: 8px 0;
225225

226+
226227
&.mx_UserInfo_device_verified {
227228
.mx_UserInfo_device_trusted {
228229
color: $accent-color;
@@ -266,6 +267,7 @@ limitations under the License.
266267
margin: 16px 0 8px;
267268
}
268269

270+
269271
.mx_VerificationShowSas {
270272
.mx_AccessibleButton + .mx_AccessibleButton {
271273
margin: 8px 0; // space between buttons

res/themes/light/css/light.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
@import "../../../../res/css/_font-sizes.scss";
32
@import "_paths.scss";
43
@import "_fonts.scss";

src/SlashCommands.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,6 @@ function successSync(value: any) {
154154
return success(Promise.resolve(value));
155155
}
156156

157-
function successSync(value: any) {
158-
return success(Promise.resolve(value));
159-
}
160-
161157
/* Disable the "unexpected this" error for these commands - all of the run
162158
* functions are called with `this` bound to the Command instance.
163159
*/

src/components/structures/TimelinePanel.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,6 @@ interface IEventIndexOpts {
205205
class TimelinePanel extends React.Component<IProps, IState> {
206206
static contextType = RoomContext;
207207

208-
static contextType = RoomContext;
209-
210208
// a map from room id to read marker event timestamp
211209
static roomReadMarkerTsMap: Record<string, number> = {};
212210

src/components/views/auth/PasswordLogin.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,17 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
import * as Email from "../../../email";
17+
import React from 'react';
18+
import classNames from 'classnames';
1819

1920
import { _t } from '../../../languageHandler';
2021
import SdkConfig from '../../../SdkConfig';
2122
import { ValidatedServerConfig } from "../../../utils/AutoDiscoveryUtils";
2223
import AccessibleButton from "../elements/AccessibleButton";
2324
import CountlyAnalytics from "../../../CountlyAnalytics";
25+
import withValidation from "../elements/Validation";
26+
import * as Email from "../../../email";
27+
import Field from "../elements/Field";
2428
import CountryDropdown from "./CountryDropdown";
2529
import { replaceableComponent } from "../../../utils/replaceableComponent";
2630

src/components/views/context_menus/DialpadContextMenu.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@ export default class DialpadContextMenu extends React.Component<IProps, IState>
4949
this.setState({ value: ev.target.value });
5050
};
5151

52-
onChange = (ev) => {
53-
this.setState({value: ev.target.value});
54-
}
55-
56-
5752
render() {
5853
return <ContextMenu {...this.props}>
5954
<div className="mx_DialPadContextMenu_header">

src/components/views/dialogs/BugReportDialog.tsx

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,6 @@ interface IState {
4343
downloadProgress: string;
4444
}
4545

46-
interface IProps {
47-
onFinished: (success: boolean) => void;
48-
initialText?: string;
49-
label?: string;
50-
}
51-
52-
interface IState {
53-
sendLogs: boolean;
54-
busy: boolean;
55-
err: string;
56-
issueUrl: string;
57-
text: string;
58-
progress: string;
59-
downloadBusy: boolean;
60-
downloadProgress: string;
61-
}
62-
6346
@replaceableComponent("views.dialogs.BugReportDialog")
6447
export default class BugReportDialog extends React.Component<IProps, IState> {
6548
private unmounted: boolean;

src/components/views/dialogs/ConfirmRedactDialog.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ interface IProps {
2323
onFinished: (success: boolean) => void;
2424
}
2525

26-
interface IProps {
27-
onFinished: (success: boolean) => void;
28-
}
29-
3026
/*
3127
* A dialog for confirming a redaction.
3228
*/

src/components/views/dialogs/DeactivateAccountDialog.tsx

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,6 @@ interface IState {
4444
continueKind: string;
4545
}
4646

47-
interface IProps {
48-
onFinished: (success: boolean) => void;
49-
}
50-
51-
interface IState {
52-
shouldErase: boolean;
53-
errStr: string;
54-
authData: any; // for UIA
55-
authEnabled: boolean; // see usages for information
56-
57-
// A few strings that are passed to InteractiveAuth for design or are displayed
58-
// next to the InteractiveAuth component.
59-
bodyText: string;
60-
continueText: string;
61-
continueKind: string;
62-
}
63-
6447
@replaceableComponent("views.dialogs.DeactivateAccountDialog")
6548
export default class DeactivateAccountDialog extends React.Component<IProps, IState> {
6649
constructor(props) {

0 commit comments

Comments
 (0)