Skip to content

Commit

Permalink
Make linter happier
Browse files Browse the repository at this point in the history
  • Loading branch information
su-ex committed Feb 28, 2023
1 parent 17bdda6 commit 4bf0df2
Show file tree
Hide file tree
Showing 90 changed files with 1,266 additions and 1,111 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- Please describe your awesome changes here -->

-----------------------------------------------------------------------------
---

- [ ] I agree to release my changes under this project's license
- [ ] I agree to release my changes under this project's license
6 changes: 4 additions & 2 deletions res/css/structures/_SpacePanel.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,8 @@ $activeBorderColor: $primary-content;
transform: rotate(45deg);
}

.mx_BaseAvatar_image, .mx_BaseAvatar_initial {
.mx_BaseAvatar_image,
.mx_BaseAvatar_initial {
border-radius: 8px;
width: $topLevelHeight !important;
height: $topLevelHeight !important;
Expand Down Expand Up @@ -293,7 +294,8 @@ $activeBorderColor: $primary-content;
.mx_SpaceTreeLevel {
// SC: doubled .mx_SpaceTreeLevel: Size down only space avatars of second hierarchy and down
.mx_SpaceButton {
.mx_BaseAvatar_image, .mx_BaseAvatar_initial {
.mx_BaseAvatar_image,
.mx_BaseAvatar_initial {
border-radius: 8px;
width: $nestedHeight !important;
height: $nestedHeight !important;
Expand Down
3 changes: 2 additions & 1 deletion res/css/structures/_UserMenu.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ limitations under the License.
}

// SC: Scale avatar well with the font size
.mx_BaseAvatar_image, .mx_BaseAvatar_initial {
.mx_BaseAvatar_image,
.mx_BaseAvatar_initial {
width: 3.2rem !important;
height: 3.2rem !important;
line-height: 3.2rem !important;
Expand Down
5 changes: 3 additions & 2 deletions res/css/views/avatars/_DecoratedRoomAvatar.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,10 @@ limitations under the License.
}
}

.mx_RoomList_Roomy .mx_DecoratedRoomAvatar, .mx_ExtraTile {
.mx_RoomList_Roomy .mx_DecoratedRoomAvatar,
.mx_ExtraTile {
&.mx_DecoratedRoomAvatar_cutout .mx_BaseAvatar {
mask-image: url('$(res)/img/element-icons/roomlist/decorated-avatar-mask-big.svg');
mask-image: url("$(res)/img/element-icons/roomlist/decorated-avatar-mask-big.svg");
}

.mx_DecoratedRoomAvatar_icon {
Expand Down
4 changes: 2 additions & 2 deletions res/css/views/context_menus/_RoomGeneralContextMenu.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@
}

.mx_RoomGeneralContextMenu_markAsUnread::before {
mask-image: url('$(res)/img/element-icons/roomlist/mark-as-unread.svg');
mask-image: url("$(res)/img/element-icons/roomlist/mark-as-unread.svg");
}

.mx_RoomGeneralContextMenu_markAsRead::before {
mask-image: url('$(res)/img/element-icons/roomlist/mark-as-read.svg');
mask-image: url("$(res)/img/element-icons/roomlist/mark-as-read.svg");
}
2 changes: 1 addition & 1 deletion res/css/views/elements/_Pill.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ limitations under the License.

&.mx_UserPill_me:hover {
color: $accent-fg-color !important; /* To override .markdown-body */
background-color: #F44336 !important; /* To override .markdown-body | same on both themes */
background-color: #f44336 !important; /* To override .markdown-body | same on both themes */
}

/* We don't want to indicate clickability */
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/elements/_StyledCheckbox.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
.mx_Checkbox {
$size: $font-16px;
$border-size: $font-1-5px;
$border-radius: min($border-radius-4px, .6rem);
$border-radius: min($border-radius-4px, 0.6rem);

display: flex;
align-items: flex-start;
Expand Down
56 changes: 36 additions & 20 deletions res/css/views/rooms/_BubbleLayout.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,16 @@ $left-gutter: 5.4rem;
> .mx_EventTile_avatar {
position: absolute;

.mx_BaseAvatar_image, .mx_BaseAvatar_initial {
.mx_BaseAvatar_image,
.mx_BaseAvatar_initial {
width: 3rem !important;
height: 3rem !important;
line-height: 3rem !important;
}
}

.mx_EventTile_line, .mx_EventTile_reply {
.mx_EventTile_line,
.mx_EventTile_reply {
padding-top: 3px;
padding-bottom: 3px;
padding-left: $left-gutter;
Expand All @@ -102,11 +104,13 @@ $left-gutter: 5.4rem;
padding-top: 0 !important;
}

.mx_EventTile_line, .mx_EventTile_reply {
.mx_EventTile_line,
.mx_EventTile_reply {
padding-left: $left-gutter;
}

.mx_GenericEventListSummary, .mx_EventTile_tileError {
.mx_GenericEventListSummary,
.mx_EventTile_tileError {
/* For toggle */
position: relative;

Expand Down Expand Up @@ -219,7 +223,13 @@ $left-gutter: 5.4rem;
margin-right: unset;

.markdown-body {
p, ul, ol, dl, blockquote, pre, table {
p,
ul,
ol,
dl,
blockquote,
pre,
table {
margin-bottom: 8px;
}

Expand Down Expand Up @@ -287,7 +297,8 @@ $left-gutter: 5.4rem;
/* margin-bottom: 10px; */
/* } */

.mx_ReplyChain, .mx_ReplyPreview {
.mx_ReplyChain,
.mx_ReplyPreview {
/* padding-top: 2px; */

.mx_EventTile_avatar {
Expand Down Expand Up @@ -347,7 +358,6 @@ $left-gutter: 5.4rem;
max-width: 100%;
}


.sc_EventTile_bubble_sticker {
.sc_MImageBody_container {
position: relative;
Expand All @@ -362,15 +372,15 @@ $left-gutter: 5.4rem;
display: inline-flex;
box-sizing: border-box;
border: 1px solid $message-bubble-background;

.mx_MFileBody_download {
display: none;
}

.sc_PlaceholderTimestamp {
display: none;
}

.mx_MessageTimestamp {
visibility: visible !important;
text-align: center;
Expand All @@ -387,7 +397,7 @@ $left-gutter: 5.4rem;
line-height: 1;
}
}

.mx_MImageBody_thumbnail {
border-radius: unset;
}
Expand Down Expand Up @@ -526,7 +536,7 @@ $left-gutter: 5.4rem;

/* ToDo: make the tail some sort of absolutely positioned rotated cutout */
&.sc_EventTile_bubble_tail::before {
content: '';
content: "";
border: 16px solid transparent;
border-top-color: $message-bubble-background;
border-bottom: 0;
Expand Down Expand Up @@ -569,7 +579,7 @@ $left-gutter: 5.4rem;

.sc_PlaceholderTimestamp {
display: inline-flex;
margin-inline-start: .7em;
margin-inline-start: 0.7em;

/* don't add additional height */
height: 0;
Expand Down Expand Up @@ -614,7 +624,8 @@ $left-gutter: 5.4rem;
}

/* ToDo: These break on small width */
.mx_MFileBody_info, .mx_MediaBody.mx_AudioPlayer_container {
.mx_MFileBody_info,
.mx_MediaBody.mx_AudioPlayer_container {
display: inline-block;
padding: 0;
padding-top: 6px;
Expand Down Expand Up @@ -713,7 +724,7 @@ $left-gutter: 5.4rem;

.sc_EventTile_bubble_info {
&::before {
content: '';
content: "";
position: absolute;
inset: 0;
box-shadow: inset 0px 0px 0px 1px $roomtopic-color;
Expand All @@ -731,7 +742,8 @@ $left-gutter: 5.4rem;
max-width: unset;
text-align: start;

&::before, &::after {
&::before,
&::after {
margin-top: 1px;
}

Expand Down Expand Up @@ -763,7 +775,8 @@ $left-gutter: 5.4rem;
padding-top: unset;
}

.mx_TextualEvent, .mx_RoomAvatarEvent {
.mx_TextualEvent,
.mx_RoomAvatarEvent {
display: inline;
opacity: 0.8;
}
Expand Down Expand Up @@ -852,7 +865,7 @@ $left-gutter: 5.4rem;
/* margin-top: 0; */
/* margin-bottom: 0; */
/* } */

.mx_MImageBody {
border: none;

Expand Down Expand Up @@ -900,7 +913,8 @@ $left-gutter: 5.4rem;
box-shadow: inset 0px 0px 0px 1px rgba($roomtopic-color, 0.15);
margin-bottom: 3rem;

&::before, &::after {
&::before,
&::after {
margin-top: 1px;
}

Expand Down Expand Up @@ -934,7 +948,9 @@ $left-gutter: 5.4rem;
max-width: calc(104rem - $left-gutter);
}

.sc_EventTile_bubbleLine_info, .mx_DateSeparator, .mx_GenericEventListSummary,
.sc_EventTile_bubbleLine_info,
.mx_DateSeparator,
.mx_GenericEventListSummary,
.mx_RoomView_MessageList > li > .mx_Spinner {
max-width: calc($left-gutter + 104rem);
}
Expand Down
3 changes: 2 additions & 1 deletion res/css/views/rooms/_NotificationBadge.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ limitations under the License.
align-items: center;
justify-content: center;

&.mx_NotificationBadge_highlighted, &.mx_NotificationBadge_highlighted.mx_NotificationBadge_dot {
&.mx_NotificationBadge_highlighted,
&.mx_NotificationBadge_highlighted.mx_NotificationBadge_dot {
/* TODO: Use a more specific variable */
background-color: $alert;
}
Expand Down
3 changes: 2 additions & 1 deletion res/css/views/rooms/_RoomHeader.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ limitations under the License.
// SC: downwards ...
object-fit: cover;

.mx_BaseAvatar_image, .mx_BaseAvatar_initial {
.mx_BaseAvatar_image,
.mx_BaseAvatar_initial {
width: 3rem !important;
height: 3rem !important;
line-height: 3rem !important;
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/rooms/_RoomListHeader.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ limitations under the License.
margin-right: 0;

&::before {
mask-image: url('$(res)/img/element-icons/roomlist/hash-search.svg');
mask-image: url("$(res)/img/element-icons/roomlist/hash-search.svg");
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions res/css/views/rooms/_RoomSublist.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -138,18 +138,19 @@ limitations under the License.
mask-image: url("$(res)/img/element-icons/roomlist/plus.svg");
}

.mx_RoomSublist_auxGroupButton, .mx_RoomSublist_auxDmButton {
.mx_RoomSublist_auxGroupButton,
.mx_RoomSublist_auxDmButton {
@extend .mx_RoomSublist_auxButton;
}

.mx_RoomSublist_auxGroupButton::before {
// mask-image: url('$(res)/img/feather-customised/group-plus.svg');
mask-image: url('$(res)/img/element-icons/roomlist/hash-plus.svg');
mask-image: url("$(res)/img/element-icons/roomlist/hash-plus.svg");
}

.mx_RoomSublist_auxDmButton::before {
// mask-image: url('$(res)/img/feather-customised/dm-plus.svg');
mask-image: url('$(res)/img/element-icons/roomlist/member-plus.svg');
mask-image: url("$(res)/img/element-icons/roomlist/member-plus.svg");
}

.mx_RoomSublist_menuButton::before {
Expand Down
Loading

0 comments on commit 4bf0df2

Please sign in to comment.