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

Commit 7c48c78

Browse files
luixxiulluixxiul
authored
Merge branch 'develop' into InviteDialog
2 parents 2fa0b7d + e980c14 commit 7c48c78

File tree

105 files changed

+1423
-1359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+1423
-1359
lines changed

‎.eslintrc.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ module.exports = {
8686
"jsx-a11y/no-static-element-interactions": "off",
8787
"jsx-a11y/role-supports-aria-props": "off",
8888
"jsx-a11y/tabindex-no-positive": "off",
89+
90+
"matrix-org/require-copyright-header": "error",
8991
},
9092
overrides: [
9193
{

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
"eslint-config-google": "^0.14.0",
174174
"eslint-plugin-import": "^2.25.4",
175175
"eslint-plugin-jsx-a11y": "^6.5.1",
176-
"eslint-plugin-matrix-org": "^0.4.0",
176+
"eslint-plugin-matrix-org": "^0.5.2",
177177
"eslint-plugin-react": "^7.28.0",
178178
"eslint-plugin-react-hooks": "^4.3.0",
179179
"fs-extra": "^10.0.1",

‎res/css/_common.scss‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,15 +385,22 @@ legend {
385385
color: $alert;
386386
}
387387

388-
.mx_Dialog_cancelButton {
388+
@define-mixin customisedCancelButton {
389389
mask: url('$(res)/img/feather-customised/cancel.svg');
390390
mask-repeat: no-repeat;
391391
mask-position: center;
392392
mask-size: cover;
393-
width: 14px;
394-
height: 14px;
395393
background-color: $dialog-close-fg-color;
396394
cursor: pointer;
395+
position: unset;
396+
width: unset;
397+
height: unset;
398+
}
399+
400+
.mx_Dialog_cancelButton {
401+
@mixin customisedCancelButton;
402+
width: 14px;
403+
height: 14px;
397404
position: absolute;
398405
top: 10px;
399406
right: 0;

‎res/css/_components.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
@import "./views/dialogs/_SpacePreferencesDialog.scss";
127127
@import "./views/dialogs/_SpaceSettingsDialog.scss";
128128
@import "./views/dialogs/_SpotlightDialog.scss";
129-
@import "./views/dialogs/_TabbedIntegrationManagerDialog.scss";
130129
@import "./views/dialogs/_TermsDialog.scss";
131130
@import "./views/dialogs/_UntrustedDeviceDialog.scss";
132131
@import "./views/dialogs/_UploadConfirmDialog.scss";
@@ -163,6 +162,7 @@
163162
@import "./views/elements/_InviteReason.scss";
164163
@import "./views/elements/_ManageIntegsButton.scss";
165164
@import "./views/elements/_MiniAvatarUploader.scss";
165+
@import "./views/elements/_Pill.scss";
166166
@import "./views/elements/_PowerSelector.scss";
167167
@import "./views/elements/_ProgressBar.scss";
168168
@import "./views/elements/_QRCode.scss";

‎res/css/structures/_RoomDirectory.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ limitations under the License.
155155
line-height: $font-20px;
156156
padding: 0 5px;
157157
color: $accent-fg-color;
158-
background-color: $rte-room-pill-color;
158+
background-color: $pill-bg-color;
159159
}
160160

161161
.mx_RoomDirectory_topic {

‎res/css/structures/auth/_CompleteSecurity.scss‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,9 @@ limitations under the License.
3434
}
3535

3636
.mx_CompleteSecurity_skip {
37-
mask: url('$(res)/img/feather-customised/cancel.svg');
38-
mask-repeat: no-repeat;
39-
mask-position: center;
40-
mask-size: cover;
37+
@mixin customisedCancelButton;
4138
width: 18px;
4239
height: 18px;
43-
background-color: $dialog-close-fg-color;
44-
cursor: pointer;
4540
position: absolute;
4641
right: 24px;
4742
}

‎res/css/views/dialogs/_CompoundDialog.scss‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,9 @@ limitations under the License.
3838
}
3939

4040
.mx_CompoundDialog_cancelButton {
41-
mask: url('$(res)/img/feather-customised/cancel.svg');
42-
mask-repeat: no-repeat;
43-
mask-position: center;
44-
mask-size: cover;
41+
@mixin customisedCancelButton;
4542
width: 20px;
4643
height: 20px;
47-
background-color: $dialog-close-fg-color;
48-
cursor: pointer;
4944

5045
// Align with middle of title, 34px from right edge
5146
position: absolute;

‎res/css/views/dialogs/_MessageEditHistoryDialog.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ limitations under the License.
5555
text-decoration: underline;
5656
}
5757

58+
.mx_EventTile {
59+
.mx_MessageTimestamp {
60+
position: absolute;
61+
}
62+
}
63+
5864
.mx_EventTile_line, .mx_EventTile_content {
5965
margin-right: 0px;
6066
}

‎res/css/views/dialogs/_TabbedIntegrationManagerDialog.scss‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎res/css/views/elements/_EditableItemList.scss‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@ limitations under the License.
2525
}
2626

2727
.mx_EditableItem_delete {
28+
@mixin customisedCancelButton;
2829
order: 3;
2930
margin-right: 5px;
30-
cursor: pointer;
3131
vertical-align: middle;
3232
width: 14px;
3333
height: 14px;
34-
mask-image: url('$(res)/img/feather-customised/cancel.svg');
35-
mask-repeat: no-repeat;
3634
background-color: $alert;
3735
mask-size: 100%;
3836
}

0 commit comments

Comments
 (0)