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

Re-add margin to tiles based on EventTileBubble #9015

Merged
merged 4 commits into from
Jul 8, 2022
Merged

Re-add margin to tiles based on EventTileBubble #9015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af34a41
Re-add margin to HistoryTile, which is based on EventTileBubble
luixxiul Jul 7, 2022
ec75abb
Readd margin to the other tiles based on EventTileBubble
luixxiul Jul 7, 2022
c1ca46b
Default margin is not required for mx_MJitsiWidgetEvent as it appears…
luixxiul Jul 7, 2022
bac319e
Cancel left value for cryptoEvent on IRC layout
luixxiul Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion res/css/views/messages/_CreateEvent.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_CreateEvent {
.mx_EventTileBubble.mx_CreateEvent {
margin: var(--EventTileBubble_margin-block) auto;

&::before {
background-color: $header-panel-text-primary-color;
mask-image: url('$(res)/img/element-icons/chat-bubbles.svg');
Expand Down
2 changes: 2 additions & 0 deletions res/css/views/messages/_EventTileBubble.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ limitations under the License.
*/

.mx_EventTileBubble {
--EventTileBubble_margin-block: 10px; // TODO: Use a spacing variable

background-color: $dark-panel-bg-color;
padding: 10px; // TODO: Use a spacing variable
border-radius: 8px;
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/messages/_MJitsiWidgetEvent.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_MJitsiWidgetEvent {
.mx_EventTileBubble.mx_MJitsiWidgetEvent {
&::before {
background-color: $header-panel-text-primary-color; // XXX: Variable abuse
mask-image: url('$(res)/img/element-icons/call/video-call.svg');
Expand Down
4 changes: 3 additions & 1 deletion res/css/views/messages/_common_CryptoEvent.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_cryptoEvent {
.mx_EventTileBubble.mx_cryptoEvent {
margin: var(--EventTileBubble_margin-block) auto;

// white infill for the transparency
&.mx_cryptoEvent_icon::before {
background-color: #ffffff;
Expand Down
6 changes: 5 additions & 1 deletion res/css/views/rooms/_EventTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ $left-gutter: 64px;
}

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

.mx_MImageBody {
Expand Down Expand Up @@ -238,6 +238,10 @@ $left-gutter: 64px;
.mx_EventTileBubble {
position: relative;
left: var(--EventTile_irc_line_info-inset-inline-start);

&.mx_cryptoEvent {
left: unset;
}
}

.mx_ReplyTile .mx_EventTileBubble {
Expand Down
10 changes: 7 additions & 3 deletions res/css/views/rooms/_HistoryTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_HistoryTile::before {
background-color: $header-panel-text-primary-color;
mask-image: url('$(res)/img/element-icons/hide.svg');
.mx_EventTileBubble.mx_HistoryTile {
margin: var(--EventTileBubble_margin-block) auto;

&::before {
background-color: $header-panel-text-primary-color;
mask-image: url('$(res)/img/element-icons/hide.svg');
}
}