Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement improved spacing for the thread list and timeline #8337

Merged
merged 41 commits into from
Apr 29, 2022
Merged

Implement improved spacing for the thread list and timeline #8337

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
b7f9296
Fix avatar size: Thread list and thread timeline
luixxiul Apr 14, 2022
54f4dfc
Thread list: Right padding
luixxiul Apr 14, 2022
05cad5e
Thread list: Padding inside each thread
luixxiul Apr 14, 2022
24d65ab
Thread list: Margin between thread and border
luixxiul Apr 14, 2022
5bcde0c
Thread list: Align the reply summary, avatar, and the content
luixxiul Apr 14, 2022
48e4db9
Thread list: Spacing with the scroll bar enabled / disabled
luixxiul Apr 15, 2022
31711f1
Thread list: Remove the magic number from the timestamp
luixxiul Apr 15, 2022
7d3ac60
Thread list: Remove !important to clarify the rule dependency
luixxiul Apr 15, 2022
0ed326f
Thread list: Spacing horizontal bar and right border
luixxiul Apr 15, 2022
8655734
Thread list: MessageActionBar
luixxiul Apr 15, 2022
fa25451
Thread list: Dedupe (profile and eventtile line padding)
luixxiul Apr 15, 2022
a93a5a8
Thread list: Background-color
luixxiul Apr 15, 2022
c4b7a3b
Normalize: Thread info icon
luixxiul Apr 15, 2022
fb8cd59
Thread Timeline: Right margin
luixxiul Apr 15, 2022
317654f
Thread list: Right margin
luixxiul Apr 15, 2022
2a366bf
Thread Timeline: Avatar left padding
luixxiul Apr 15, 2022
8ee9e71
Thread Timeline: Message left margin
luixxiul Apr 15, 2022
25b854f
Thread Timeline: Action bar position
luixxiul Apr 15, 2022
bba2bde
Thread Timeline: Message action bar position and padding inside a mes…
luixxiul Apr 15, 2022
e7988ec
Thread Timeline: Spacing between the avatar and the right border (bub…
luixxiul Apr 15, 2022
ba6d4a9
Add comments
luixxiul Apr 15, 2022
29bb381
Thread Timeline: Fix sender ID, avatar, and spacing
luixxiul Apr 15, 2022
d80cc2e
Merge branch 'develop' into Thread
luixxiul Apr 20, 2022
0661f0f
Set z-index to MessageActionBar with a variable
luixxiul Apr 26, 2022
e9ea310
8px spacing with AutoHideScrollbar
luixxiul Apr 26, 2022
b4187e4
8px spacing below mx_EventTile_line
luixxiul Apr 26, 2022
b739ebf
Add 2px to leftOffset
luixxiul Apr 26, 2022
5b867c6
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-…
luixxiul Apr 27, 2022
e97d112
Remove ThreadPanel_ThreadInfo
luixxiul Apr 27, 2022
3ab6c70
Vertical: 12px gap and 20px gap
luixxiul Apr 27, 2022
a413e3a
Horizontal: spacing
luixxiul Apr 27, 2022
ef33183
Vertical: spacing around 1px horizontal line
luixxiul Apr 28, 2022
addd6a7
Fix regressions: chat panel with a maximized widget
luixxiul Apr 28, 2022
afce31e
Set padding-top: 16px
luixxiul Apr 28, 2022
5fb4274
Fix regression: timestamp position inside a thread
luixxiul Apr 28, 2022
b737bef
Fix position of the message action bar
luixxiul Apr 28, 2022
1a5b503
Fix regression: line height of profile
luixxiul Apr 28, 2022
e65bb2e
Simplify the structure
luixxiul Apr 28, 2022
423a235
Revert the one line change
luixxiul Apr 28, 2022
7c06cbe
Update src/components/views/rooms/EventTile.tsx
luixxiul Apr 29, 2022
508dbb2
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-…
luixxiul Apr 29, 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
13 changes: 1 addition & 12 deletions res/css/views/right_panel/_ThreadPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ limitations under the License.
overflow-y: scroll; // set gap between the thread tile and the right border
}

// Override _GroupLayout.scss for the thread panel
.mx_GroupLayout {
.mx_EventTile {
> .mx_DisambiguatedProfile {
Expand All @@ -125,18 +126,6 @@ limitations under the License.
}
}

// chat panel with a maximized widget
&.mx_TimelineCard {
.mx_GroupLayout {
.mx_EventTile {
.mx_MessageTimestamp {
position: absolute;
width: $MessageTimestamp_width;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are partial revert of addd6a7. They are not required thanks to the original properties on _GroupLayout.scss.

}
}
}
}

&.mx_ThreadView .mx_ThreadView_timelinePanelWrapper {
position: relative;
min-height: 0; // don't displace the composer
Expand Down
3 changes: 1 addition & 2 deletions res/css/views/rooms/_EventTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,8 +915,7 @@ $eventTileZIndex: 10;
}

.mx_MessageTimestamp {
top: 2px !important;
width: auto;
top: 2px; // Align with mx_EventTile_content
}

.mx_EventTile_senderDetails {
Expand Down