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

Commit f3b2ff9

Browse files
luixxiulluixxiul
authored
Merge branch 'develop' into AccessSecretStorageDialog
2 parents ad13142 + c86040b commit f3b2ff9

Some content is hidden

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

41 files changed

+121
-736
lines changed

‎res/css/_components.scss‎

Lines changed: 0 additions & 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";

‎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/messages/_MLocationBody.scss‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ limitations under the License.
1515
*/
1616

1717
.mx_MLocationBody {
18+
max-width: 100%;
19+
1820
.mx_MLocationBody_map {
21+
max-width: 100%;
1922
width: 450px;
2023
height: 300px;
2124
z-index: 0; // keeps the entire map under the message action bar
@@ -27,15 +30,11 @@ limitations under the License.
2730

2831
/* In the timeline, we fit the width of the container */
2932
.mx_EventTile_line .mx_MLocationBody .mx_MLocationBody_map {
30-
width: 100%;
3133
max-width: 450px;
34+
width: 100%;
3235
}
3336

34-
.mx_EventTile[data-layout="bubble"] .mx_EventTile_line .mx_MLocationBody {
37+
.mx_EventTile[data-layout="bubble"] .mx_EventTile_line .mx_MLocationBody .mx_MLocationBody_map {
3538
max-width: 100%;
36-
37-
.mx_MLocationBody_map {
38-
max-width: 100%;
39-
width: 450px;
40-
}
39+
width: 450px;
4140
}

‎res/css/views/messages/_MessageTimestamp.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ limitations under the License.
1818
color: $event-timestamp-color;
1919
font-size: $font-10px;
2020
font-variant-numeric: tabular-nums;
21+
width: $MessageTimestamp_width;
2122
}

‎res/css/views/messages/_TextualEvent.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
.mx_TextualEvent {
1818
opacity: 0.5;
1919
overflow-y: hidden;
20+
line-height: normal;
2021

2122
a {
2223
color: $accent;

‎res/css/views/right_panel/_TimelineCard.scss‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,39 +43,48 @@ limitations under the License.
4343
}
4444

4545
.mx_NewRoomIntro {
46-
margin-left: 36px;
46+
margin-inline-start: 36px; // TODO: Use a variable
47+
margin-inline-end: 36px; // TODO: Use a variable
4748
}
4849

4950
.mx_EventTile_content {
5051
margin-right: 0;
5152
}
5253

5354
.mx_EventTile:not([data-layout="bubble"]) {
55+
$left-gutter: 36px;
56+
5457
.mx_EventTile_line {
55-
padding-left: 36px;
56-
padding-right: 36px;
58+
padding-inline-start: $left-gutter;
59+
padding-inline-end: 36px;
60+
}
61+
62+
.mx_DisambiguatedProfile,
63+
.mx_ReactionsRow,
64+
.mx_ThreadSummary {
65+
margin-inline-start: $left-gutter;
5766
}
5867

5968
.mx_ReactionsRow {
6069
padding: 0;
6170

6271
// See margin setting of ReactionsRow on _EventTile.scss
63-
margin-left: 36px;
6472
margin-right: 8px;
6573
}
6674

6775
.mx_ThreadSummary {
68-
margin-left: 36px;
6976
margin-right: 0;
7077
max-width: min(calc(100% - 36px), 600px);
7178
}
7279

7380
.mx_EventTile_avatar {
81+
position: absolute; // for IRC layout
7482
top: 12px;
7583
left: -3px;
7684
}
7785

7886
.mx_MessageTimestamp {
87+
position: absolute; // for modern layout and IRC layout
7988
right: -4px;
8089
left: auto;
8190
}
@@ -86,7 +95,7 @@ limitations under the License.
8695

8796
&.mx_EventTile_info {
8897
.mx_EventTile_line {
89-
padding-left: 36px;
98+
padding-left: $left-gutter;
9099
}
91100

92101
.mx_EventTile_avatar {

‎res/css/views/rooms/_EventTile.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
704704

705705
.mx_MessagePanel_narrow .mx_ThreadSummary {
706706
min-width: initial;
707-
max-width: initial;
707+
max-width: 100%; // prevent overflow
708708
width: initial;
709709
}
710710

‎res/css/views/rooms/_GroupLayout.scss‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ $left-gutter: 64px;
3030
}
3131

3232
.mx_MessageTimestamp {
33-
position: absolute;
34-
width: $MessageTimestamp_width;
33+
position: absolute; // for modern layout
3534
}
3635

3736
.mx_EventTile_line, .mx_EventTile_reply {

‎res/css/views/rooms/_IRCLayout.scss‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ limitations under the License.
1515
*/
1616

1717
$icon-width: 14px;
18-
$timestamp-width: 45px;
1918
$right-padding: 5px;
2019
$irc-line-height: $font-18px;
2120

@@ -28,7 +27,7 @@ $irc-line-height: $font-18px;
2827
// timestamps are links which shouldn't be underlined
2928
> a {
3029
text-decoration: none;
31-
min-width: 45px;
30+
min-width: $MessageTimestamp_width;
3231
}
3332

3433
display: flex;
@@ -85,7 +84,6 @@ $irc-line-height: $font-18px;
8584

8685
.mx_MessageTimestamp {
8786
font-size: $font-10px;
88-
width: $timestamp-width;
8987
text-align: right;
9088
}
9189

@@ -141,7 +139,7 @@ $irc-line-height: $font-18px;
141139

142140
.mx_GenericEventListSummary {
143141
> .mx_EventTile_line {
144-
padding-left: calc(var(--name-width) + $icon-width + $timestamp-width + 3 * $right-padding); // 15 px of padding
142+
padding-left: calc(var(--name-width) + $icon-width + $MessageTimestamp_width + 3 * $right-padding); // 15 px of padding
145143
}
146144

147145
.mx_GenericEventListSummary_avatars {

0 commit comments

Comments
 (0)