From 6cdda54e5edbbf56559cefc2961ff2c9ae6cf37b Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 9 Jul 2022 16:51:37 +0900 Subject: [PATCH 1/9] Include mx_DisambiguatedProfile and mx_MessageTimestamp Signed-off-by: Suguru Hirahara --- res/css/structures/_FilePanel.scss | 38 ++++++++++++++---------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss index cb791ebfcbc..ad0144604cc 100644 --- a/res/css/structures/_FilePanel.scss +++ b/res/css/structures/_FilePanel.scss @@ -87,28 +87,26 @@ limitations under the License. white-space: nowrap; } - .mx_DisambiguatedProfile { - flex: 1 1 auto; - line-height: initial; - opacity: 1.0; - color: $event-timestamp-color; - } - - .mx_MessageTimestamp { - flex: 1 0 0; - text-align: right; - visibility: visible; - position: initial; - font-size: $font-14px; - opacity: 1.0; - } - } + .mx_EventTile_senderDetails { + display: flex; + margin-top: -2px; - /* Overides for the sender details line */ + .mx_DisambiguatedProfile { + flex: 1 1 auto; + line-height: initial; + opacity: 1.0; + color: $event-timestamp-color; + } - .mx_EventTile_senderDetails { - display: flex; - margin-top: -2px; + .mx_MessageTimestamp { + flex: 1 0 0; + text-align: right; + visibility: visible; + position: initial; + font-size: $font-14px; + opacity: 1.0; + } + } } .mx_EventTile_senderDetailsLink { From 3794a2d4c6e09b24be2f4cef48258be9a5d76869 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 9 Jul 2022 16:52:10 +0900 Subject: [PATCH 2/9] Create space between profile and timestamp Signed-off-by: Suguru Hirahara --- res/css/structures/_FilePanel.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss index ad0144604cc..a7da1b14afd 100644 --- a/res/css/structures/_FilePanel.scss +++ b/res/css/structures/_FilePanel.scss @@ -89,17 +89,16 @@ limitations under the License. .mx_EventTile_senderDetails { display: flex; + justify-content: space-between; margin-top: -2px; .mx_DisambiguatedProfile { - flex: 1 1 auto; line-height: initial; opacity: 1.0; color: $event-timestamp-color; } .mx_MessageTimestamp { - flex: 1 0 0; text-align: right; visibility: visible; position: initial; From 55ecac785d4c3c87296d6c2ddb8b336f41672037 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 9 Jul 2022 16:53:39 +0900 Subject: [PATCH 3/9] Remove obsolete declarations Signed-off-by: Suguru Hirahara --- res/css/structures/_FilePanel.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss index a7da1b14afd..b59b0250679 100644 --- a/res/css/structures/_FilePanel.scss +++ b/res/css/structures/_FilePanel.scss @@ -94,16 +94,12 @@ limitations under the License. .mx_DisambiguatedProfile { line-height: initial; - opacity: 1.0; color: $event-timestamp-color; } .mx_MessageTimestamp { text-align: right; - visibility: visible; - position: initial; font-size: $font-14px; - opacity: 1.0; } } } From 83692d2559e395e46b189c9d5d0163c0ac081152 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 9 Jul 2022 16:55:19 +0900 Subject: [PATCH 4/9] Include mx_MImageBody_size Signed-off-by: Suguru Hirahara --- res/css/structures/_FilePanel.scss | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss index b59b0250679..4b2e5b3a30c 100644 --- a/res/css/structures/_FilePanel.scss +++ b/res/css/structures/_FilePanel.scss @@ -71,8 +71,15 @@ limitations under the License. .mx_MFileBody_download { padding-top: $spacing-8; display: flex; + justify-content: space-between; font-size: $font-14px; color: $event-timestamp-color; + + .mx_MImageBody_size { + font-size: $font-14px; + text-align: right; + white-space: nowrap; + } } .mx_MFileBody_downloadLink { @@ -80,13 +87,6 @@ limitations under the License. color: $light-fg-color; } - .mx_MImageBody_size { - flex: 1 0 0; - font-size: $font-14px; - text-align: right; - white-space: nowrap; - } - .mx_EventTile_senderDetails { display: flex; justify-content: space-between; From b735251f0346f6836a79b5b0674831cb275a2906 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 9 Jul 2022 16:56:49 +0900 Subject: [PATCH 5/9] Clarify mx_EventTile_senderDetailsLink works as a wrapper Signed-off-by: Suguru Hirahara --- res/css/structures/_FilePanel.scss | 35 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss index 4b2e5b3a30c..86648f9347b 100644 --- a/res/css/structures/_FilePanel.scss +++ b/res/css/structures/_FilePanel.scss @@ -87,29 +87,28 @@ limitations under the License. color: $light-fg-color; } - .mx_EventTile_senderDetails { - display: flex; - justify-content: space-between; - margin-top: -2px; - - .mx_DisambiguatedProfile { - line-height: initial; - color: $event-timestamp-color; - } + // anchor link as wrapper + .mx_EventTile_senderDetailsLink { + text-decoration: none; + + .mx_EventTile_senderDetails { + display: flex; + justify-content: space-between; + margin-top: -2px; + + .mx_DisambiguatedProfile { + line-height: initial; + color: $event-timestamp-color; + } - .mx_MessageTimestamp { - text-align: right; - font-size: $font-14px; + .mx_MessageTimestamp { + text-align: right; + font-size: $font-14px; + } } } } - .mx_EventTile_senderDetailsLink { - text-decoration: none; - } - - /* Overrides for the wrappers around the body tile */ - .mx_EventTile_line { margin-inline-end: 0; padding-inline-start: 0; From 16bb2fbbdbc37fb6ac0b03bcbac1ed0eafb5e0f0 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 9 Jul 2022 16:58:34 +0900 Subject: [PATCH 6/9] Apply color value to child elements of mx_DisambiguatedProfile Signed-off-by: Suguru Hirahara --- res/css/structures/_FilePanel.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss index 86648f9347b..f93fd45977b 100644 --- a/res/css/structures/_FilePanel.scss +++ b/res/css/structures/_FilePanel.scss @@ -98,7 +98,11 @@ limitations under the License. .mx_DisambiguatedProfile { line-height: initial; - color: $event-timestamp-color; + + .mx_DisambiguatedProfile_displayName, + .mx_DisambiguatedProfile_mxid { + color: $event-timestamp-color; + } } .mx_MessageTimestamp { From 55ad1d313627640cce6f2f65e166b1ec29133056 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 9 Jul 2022 16:59:30 +0900 Subject: [PATCH 7/9] Remove obsolete declaration and a redundant style block Signed-off-by: Suguru Hirahara --- res/css/structures/_FilePanel.scss | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss index f93fd45977b..981fa714e66 100644 --- a/res/css/structures/_FilePanel.scss +++ b/res/css/structures/_FilePanel.scss @@ -96,13 +96,9 @@ limitations under the License. justify-content: space-between; margin-top: -2px; - .mx_DisambiguatedProfile { - line-height: initial; - - .mx_DisambiguatedProfile_displayName, - .mx_DisambiguatedProfile_mxid { - color: $event-timestamp-color; - } + .mx_DisambiguatedProfile_displayName, + .mx_DisambiguatedProfile_mxid { + color: $event-timestamp-color; } .mx_MessageTimestamp { From 49fb3878d6ca0059fa02a7e082a9e47eae543c96 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 9 Jul 2022 17:47:28 +0900 Subject: [PATCH 8/9] Apply color for ellipsis Signed-off-by: Suguru Hirahara --- res/css/structures/_FilePanel.scss | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss index 981fa714e66..cfef876c064 100644 --- a/res/css/structures/_FilePanel.scss +++ b/res/css/structures/_FilePanel.scss @@ -96,9 +96,13 @@ limitations under the License. justify-content: space-between; margin-top: -2px; - .mx_DisambiguatedProfile_displayName, - .mx_DisambiguatedProfile_mxid { - color: $event-timestamp-color; + .mx_DisambiguatedProfile { + color: $event-timestamp-color; // for ellipsis + + .mx_DisambiguatedProfile_displayName, + .mx_DisambiguatedProfile_mxid { + color: $event-timestamp-color; + } } .mx_MessageTimestamp { From 969e2702ab688b52e2a88820e11600ee93ebed11 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Wed, 13 Jul 2022 02:44:06 +0900 Subject: [PATCH 9/9] Remove declarations for color setting and add a comment Signed-off-by: Suguru Hirahara --- res/css/structures/_FilePanel.scss | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss index cfef876c064..8f00d9f664d 100644 --- a/res/css/structures/_FilePanel.scss +++ b/res/css/structures/_FilePanel.scss @@ -97,12 +97,7 @@ limitations under the License. margin-top: -2px; .mx_DisambiguatedProfile { - color: $event-timestamp-color; // for ellipsis - - .mx_DisambiguatedProfile_displayName, - .mx_DisambiguatedProfile_mxid { - color: $event-timestamp-color; - } + color: $event-timestamp-color; // for ellipsis. Color of displayName and mxid is inherited } .mx_MessageTimestamp {