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

Commit

Permalink
Apply tweaks to Thread list as per design spec (#8149)
Browse files Browse the repository at this point in the history
Co-authored-by: Germain Souquet <[email protected]>
  • Loading branch information
t3chguy and Germain Souquet authored Apr 5, 2022
1 parent 4f6b939 commit 27e4806
Show file tree
Hide file tree
Showing 7 changed files with 173 additions and 72 deletions.
40 changes: 31 additions & 9 deletions res/css/views/right_panel/_ThreadPanel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,17 @@ limitations under the License.

.mx_BaseCard_header {
margin-bottom: 12px;

.mx_BaseCard_close,
.mx_BaseCard_back {
width: 24px;
height: 24px;
}

.mx_BaseCard_back {
left: -4px;
}

.mx_BaseCard_close {
right: -4px;
}
Expand Down Expand Up @@ -66,6 +69,7 @@ limitations under the License.
--size: 24px;
width: var(--size);
height: var(--size);

&::after {
mask-size: var(--size);
mask-image: url("$(res)/img/element-icons/message/overflow-large.svg");
Expand Down Expand Up @@ -99,11 +103,10 @@ limitations under the License.
}

.mx_AutoHideScrollbar {
background: #fff;
background-color: $background;
border-radius: 8px;
width: calc(100% - 16px);
padding-right: 16px;
width: calc(100% - 24px);
padding-right: 18px;
}

&.mx_ThreadView .mx_ThreadView_timelinePanelWrapper {
Expand All @@ -125,13 +128,15 @@ limitations under the License.
padding-right: 0;
}

.mx_EventTile, .mx_GenericEventListSummary {
.mx_EventTile,
.mx_GenericEventListSummary {
// Account for scrollbar when hovering
padding-top: 0;

.mx_ThreadInfo {
position: relative;
padding-right: 11px;

&::after {
content: '';
display: block;
Expand All @@ -157,6 +162,10 @@ limitations under the License.
.mx_EventTile_e2eIcon {
left: 8px;
}

&:hover .mx_EventTile_line {
box-shadow: unset !important; // don't show the verification left stroke in the thread list
}
}

.mx_MessageComposer {
Expand Down Expand Up @@ -190,10 +199,6 @@ limitations under the License.
float: right;
}

.mx_ThreadPanel_dropdown[aria-expanded=true]::before {
transform: rotate(180deg);
}

.mx_MessageTimestamp {
font-size: $font-12px;
color: $secondary-content;
Expand Down Expand Up @@ -272,26 +277,39 @@ limitations under the License.

h2 {
color: $primary-content;
font-weight: 600;
font-weight: $font-semi-bold;
font-size: $font-18px;
margin-top: 24px;
margin-bottom: 10px;
}

p {
font-size: $font-15px;
color: $secondary-content;
margin: 10px 0;
}

button {
border: none;
background: none;
color: $accent;
font-size: $font-15px;

&:hover,
&:active {
text-decoration: underline;
cursor: pointer;
}
}

.mx_ThreadPanel_empty_tip {
font-size: $font-12px;
line-height: $font-15px;

>b {
font-weight: $font-semi-bold;
}
}
}

.mx_ThreadPanel_largeIcon {
Expand All @@ -317,6 +335,7 @@ limitations under the License.
.mx_ContextualMenu_wrapper.mx_ThreadPanel__header {
.mx_ContextualMenu {
position: initial;

span:first-of-type {
font-weight: $font-semi-bold;
font-size: inherit;
Expand All @@ -336,6 +355,7 @@ limitations under the License.
left: auto;
right: 22px;
border-bottom-color: $quinary-content;

&::after {
content: "";
border: inherit;
Expand All @@ -357,10 +377,12 @@ limitations under the License.
&:hover {
background-color: $event-selected-color;
}

&[aria-checked="true"] {
:first-child {
margin-left: -20px;
}

:first-child::before {
content: "";
width: 12px;
Expand Down
Loading

0 comments on commit 27e4806

Please sign in to comment.