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

Commit b1f8d36

Browse files
authored
Re-add margin to tiles based on EventTileBubble (#9015)
* Re-add margin to HistoryTile, which is based on EventTileBubble Signed-off-by: Suguru Hirahara <[email protected]> * Readd margin to the other tiles based on EventTileBubble Signed-off-by: Suguru Hirahara <[email protected]> * Default margin is not required for mx_MJitsiWidgetEvent as it appears inside EventTile Signed-off-by: Suguru Hirahara <[email protected]> * Cancel left value for cryptoEvent on IRC layout Signed-off-by: Suguru Hirahara <[email protected]>
1 parent 39816f6 commit b1f8d36

File tree

6 files changed

+21
-7
lines changed

6 files changed

+21
-7
lines changed

res/css/views/messages/_CreateEvent.scss

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

17-
.mx_CreateEvent {
17+
.mx_EventTileBubble.mx_CreateEvent {
18+
margin: var(--EventTileBubble_margin-block) auto;
19+
1820
&::before {
1921
background-color: $header-panel-text-primary-color;
2022
mask-image: url('$(res)/img/element-icons/chat-bubbles.svg');

res/css/views/messages/_EventTileBubble.scss

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

1717
.mx_EventTileBubble {
18+
--EventTileBubble_margin-block: 10px; // TODO: Use a spacing variable
19+
1820
background-color: $dark-panel-bg-color;
1921
padding: 10px; // TODO: Use a spacing variable
2022
border-radius: 8px;

res/css/views/messages/_MJitsiWidgetEvent.scss

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

17-
.mx_MJitsiWidgetEvent {
17+
.mx_EventTileBubble.mx_MJitsiWidgetEvent {
1818
&::before {
1919
background-color: $header-panel-text-primary-color; // XXX: Variable abuse
2020
mask-image: url('$(res)/img/element-icons/call/video-call.svg');

res/css/views/messages/_common_CryptoEvent.scss

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

17-
.mx_cryptoEvent {
17+
.mx_EventTileBubble.mx_cryptoEvent {
18+
margin: var(--EventTileBubble_margin-block) auto;
19+
1820
// white infill for the transparency
1921
&.mx_cryptoEvent_icon::before {
2022
background-color: #ffffff;

res/css/views/rooms/_EventTile.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ $left-gutter: 64px;
7474
}
7575

7676
.mx_EventTileBubble {
77-
margin-block: 10px; // TODO: Use a spacing variable
77+
margin-block: var(--EventTileBubble_margin-block);
7878
}
7979

8080
.mx_MImageBody {
@@ -238,6 +238,10 @@ $left-gutter: 64px;
238238
.mx_EventTileBubble {
239239
position: relative;
240240
left: var(--EventTile_irc_line_info-inset-inline-start);
241+
242+
&.mx_cryptoEvent {
243+
left: unset;
244+
}
241245
}
242246

243247
.mx_ReplyTile .mx_EventTileBubble {

res/css/views/rooms/_HistoryTile.scss

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
.mx_HistoryTile::before {
18-
background-color: $header-panel-text-primary-color;
19-
mask-image: url('$(res)/img/element-icons/hide.svg');
17+
.mx_EventTileBubble.mx_HistoryTile {
18+
margin: var(--EventTileBubble_margin-block) auto;
19+
20+
&::before {
21+
background-color: $header-panel-text-primary-color;
22+
mask-image: url('$(res)/img/element-icons/hide.svg');
23+
}
2024
}

0 commit comments

Comments
 (0)