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

Commit f342f4d

Browse files
authored
Tidy up _RoomView.pcss (#10744)
* Include: `mx_MainSplit` Signed-off-by: Suguru Hirahara <[email protected]> * Include: `mx_RoomView_messagePanelSearchSpinner::before` Signed-off-by: Suguru Hirahara <[email protected]> * Include: `mx_RoomView_timeline` Signed-off-by: Suguru Hirahara <[email protected]> * Include: `mx_RoomView_MessageList li` Signed-off-by: Suguru Hirahara <[email protected]> * Include: `mx_RoomView_inCall` Signed-off-by: Suguru Hirahara <[email protected]> * Include: `mx_RoomView .mx_MessageComposer` Signed-off-by: Suguru Hirahara <[email protected]> * Run prettier Signed-off-by: Suguru Hirahara <[email protected]> --------- Signed-off-by: Suguru Hirahara <[email protected]>
1 parent 0adf465 commit f342f4d

File tree

1 file changed

+45
-43
lines changed

1 file changed

+45
-43
lines changed

res/css/structures/_RoomView.pcss

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,16 @@ limitations under the License.
3434
flex-direction: column;
3535
flex: 1;
3636
position: relative;
37+
38+
.mx_MainSplit {
39+
flex: 1 1 0;
40+
}
41+
42+
.mx_MessageComposer {
43+
width: 100%;
44+
flex: 0 0 auto;
45+
margin-right: 2px;
46+
}
3747
}
3848

3949
.mx_RoomView_auxPanel {
@@ -51,10 +61,6 @@ limitations under the License.
5161
cursor: pointer;
5262
}
5363

54-
.mx_RoomView .mx_MainSplit {
55-
flex: 1 1 0;
56-
}
57-
5864
.mx_RoomView_messagePanel {
5965
width: 100%;
6066
overflow-y: auto;
@@ -69,20 +75,20 @@ limitations under the License.
6975
background-size: 25px;
7076
background-repeat: no-repeat;
7177
position: relative;
72-
}
7378

74-
.mx_RoomView_messagePanelSearchSpinner::before {
75-
background-color: $info-plinth-fg-color;
76-
mask: url("$(res)/img/feather-customised/search-input.svg");
77-
mask-repeat: no-repeat;
78-
mask-position: center;
79-
mask-size: 50px;
80-
content: "";
81-
position: absolute;
82-
top: 286px;
83-
left: 0;
84-
right: 0;
85-
height: 50px;
79+
&::before {
80+
background-color: $info-plinth-fg-color;
81+
mask: url("$(res)/img/feather-customised/search-input.svg");
82+
mask-repeat: no-repeat;
83+
mask-position: center;
84+
mask-size: 50px;
85+
content: "";
86+
position: absolute;
87+
top: 286px;
88+
left: 0;
89+
right: 0;
90+
height: 50px;
91+
}
8692
}
8793

8894
.mx_RoomView_body {
@@ -96,15 +102,15 @@ limitations under the License.
96102
.mx_RoomView_messagePanelSearchSpinner {
97103
order: 2;
98104
}
99-
}
100105

101-
.mx_RoomView_body .mx_RoomView_timeline {
102-
/* offset parent for mx_RoomView_topUnreadMessagesBar */
103-
position: relative;
104-
flex: 1;
105-
display: flex;
106-
flex-direction: column;
107-
margin-right: calc($container-gap-width / 2);
106+
.mx_RoomView_timeline {
107+
/* offset parent for mx_RoomView_topUnreadMessagesBar */
108+
position: relative;
109+
flex: 1;
110+
display: flex;
111+
flex-direction: column;
112+
margin-right: calc($container-gap-width / 2);
113+
}
108114
}
109115

110116
.mx_RoomView_statusArea {
@@ -171,16 +177,16 @@ limitations under the License.
171177
/* needed as min-height is set to clientHeight in ScrollPanel
172178
to prevent shrinking when WhoIsTypingTile is hidden */
173179
box-sizing: border-box;
180+
181+
li {
182+
clear: both;
183+
}
174184
}
175185

176186
.mx_RoomView--local .mx_ScrollPanel .mx_RoomView_MessageList {
177187
justify-content: center;
178188
}
179189

180-
.mx_RoomView_MessageList li {
181-
clear: both;
182-
}
183-
184190
li.mx_RoomView_myReadMarker_container {
185191
height: 0px;
186192
margin: 0px;
@@ -206,21 +212,17 @@ hr.mx_RoomView_myReadMarker {
206212
border: unset;
207213
}
208214

209-
.mx_RoomView_inCall .mx_RoomView_statusAreaBox_line {
210-
margin-top: 2px;
211-
border: none;
212-
height: 0px;
213-
}
214-
215-
.mx_RoomView_inCall .mx_MessageComposer_wrapper {
216-
border-top: 2px hidden;
217-
padding-top: 1px;
218-
}
215+
.mx_RoomView_inCall {
216+
.mx_RoomView_statusAreaBox_line {
217+
margin-top: 2px;
218+
border: none;
219+
height: 0px;
220+
}
219221

220-
.mx_RoomView .mx_MessageComposer {
221-
width: 100%;
222-
flex: 0 0 auto;
223-
margin-right: 2px;
222+
.mx_MessageComposer_wrapper {
223+
border-top: 2px hidden;
224+
padding-top: 1px;
225+
}
224226
}
225227

226228
.mx_MatrixChat_useCompactLayout {

0 commit comments

Comments
 (0)