matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-30 02:21:17 +03:00
Code Activity

Refine the colors of some more components (#12343)

Browse Source 
* Refine the colors of some more components

This is a reintroduction of https://github.com/matrix-org/matrix-react-sdk/pull/12255, and should be the last part of the Compound color refinement work (https://github.com/element-hq/element-web/issues/26992). I've updated the following components to reflect design decisions (https://www.figma.com/file/pqhlirZFEwEp5XpudSbiia/Theming-Web-templates?type=design&node-id=80-60219&mode=design&t=mjqwylUie1vRwzOV-0) that will help them fit in better with the new design system:

- Message bubbles
- Pills
- Sent indicators
- Jump to bottom/unread buttons
- Composer placeholder
- Notification badges
- Room sublists
- Verification shields
- Date separators
- Tooltips

Closes https://github.com/element-hq/element-web/issues/22122

* Update some screenshots
This commit is contained in:
Robin
2024-03-18 11:47:55 -04:00
committed by GitHub
parent f765a44b46
commit 26b4d47af1
49 changed files with 63 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/css/_common.pcss
View File

@ -646,7 +646,7 @@ legend {
.mx_Dialog button.warning:not(.mx_Dialog_nonDialogButton):not([class|="maplibregl"]),
.mx_Dialog input[type="submit"].warning {
border: solid 1px var(--cpd-color-border-critical-primary);
border: solid 1px var(--cpd-color-border-critical-subtle);
color: var(--cpd-color-text-critical-primary);
}

10
res/css/views/elements/_Pill.pcss
View File

@ -26,7 +26,7 @@ limitations under the License.
overflow: hidden;
cursor: pointer;
color: $accent-fg-color !important; /* To override .markdown-body */
color: var(--cpd-color-text-on-solid-primary) !important; /* To override .markdown-body */
background-color: $pill-bg-color !important; /* To override .markdown-body */
> * {
@ -35,7 +35,7 @@ limitations under the License.
&.mx_UserPill_me,
&.mx_AtRoomPill {
background-color: $alert !important; /* To override .markdown-body */
background-color: var(--cpd-color-bg-critical-primary) !important; /* To override .markdown-body */
}
&:hover {
@ -43,12 +43,14 @@ limitations under the License.
}
&.mx_UserPill_me:hover {
background-color: #ff6b75 !important; /* To override .markdown-body | same on both themes */
background-color: var(
--cpd-color-bg-critical-hovered
) !important; /* To override .markdown-body | same on both themes */
}
/* We don't want to indicate clickability */
&.mx_AtRoomPill:hover {
background-color: $alert !important; /* To override .markdown-body */
background-color: var(--cpd-color-bg-critical-primary) !important; /* To override .markdown-body */
cursor: unset;
}

4
res/css/views/elements/_Tooltip.pcss
View File

@ -71,8 +71,8 @@ limitations under the License.
max-width: 300px;
word-break: break-word;
background-color: #21262c; /* Same on both themes */
color: $accent-fg-color;
background-color: var(--cpd-color-alpha-gray-1400);
color: var(--cpd-color-text-on-solid-primary);
border: 0;
text-align: center;

2
res/css/views/messages/_DateSeparator.pcss
View File

@ -39,5 +39,5 @@ limitations under the License.
mask-size: contain;
mask-repeat: no-repeat;
mask-image: url("$(res)/img/feather-customised/chevron-down.svg");
background-color: $tertiary-content;
background-color: var(--cpd-color-icon-secondary);
}

4
res/css/views/messages/_TimelineSeparator.pcss
View File

@ -20,12 +20,12 @@ limitations under the License.
display: flex;
align-items: center;
font: var(--cpd-font-body-md-regular);
color: $roomtopic-color;
color: var(--cpd-color-text-secondary);
}
.mx_TimelineSeparator > hr {
flex: 1 1 0;
height: 0;
border: none;
border-bottom: 1px solid $menu-selected-color;
border-bottom: 1px solid var(--cpd-color-gray-400);
}

2
res/css/views/rooms/_BasicMessageComposer.pcss
View File

@ -20,7 +20,7 @@ limitations under the License.
.mx_BasicMessageComposer_inputEmpty > :first-child::before {
content: var(--placeholder);
opacity: 0.333;
color: var(--cpd-color-text-secondary);
width: 0;
height: 0;
overflow: visible;

12
res/css/views/rooms/_E2EIcon.pcss
View File

@ -37,15 +37,6 @@ limitations under the License.
}
}
/* white infill for the transparency */
.mx_E2EIcon::before {
background-color: #ffffff;
mask-image: url("$(res)/img/e2e/normal.svg");
mask-repeat: no-repeat;
mask-position: center;
mask-size: 80%;
}
/* transparent-looking border surrounding the shield for when overlain over avatars */
.mx_E2EIcon_bordered {
mask-image: url("$(res)/img/e2e/normal.svg");
@ -59,6 +50,7 @@ limitations under the License.
/* shrink the infill of the badge */
&::before {
mask-size: 60%;
background: var(--cpd-color-bg-canvas-default);
}
}
@ -69,7 +61,7 @@ limitations under the License.
.mx_E2EIcon_normal::after {
mask-image: url("$(res)/img/e2e/normal.svg");
background-color: $header-panel-text-primary-color;
background-color: var(--cpd-color-icon-tertiary);
}
.mx_E2EIcon_verified::after {

6
res/css/views/rooms/_EventTile.pcss
View File

@ -53,7 +53,7 @@ $left-gutter: 64px;
height: 16px;
&::before {
background-color: $tertiary-content;
background-color: var(--cpd-color-icon-tertiary);
mask-repeat: no-repeat;
mask-position: center;
mask-size: 16px;
@ -858,12 +858,12 @@ $left-gutter: 64px;
&.mx_EventTile_e2eIcon_normal::after {
mask-image: url("$(res)/img/e2e/normal.svg"); /* regular shield */
background-color: $header-panel-text-primary-color; /* grey */
background-color: var(--cpd-color-icon-tertiary); /* grey */
}
&.mx_EventTile_e2eIcon_decryption_failure::after {
mask-image: url("$(res)/img/e2e/decryption-failure.svg"); /* key in a circle */
background-color: $secondary-content;
background-color: var(--cpd-color-icon-tertiary);
}
}

11
res/css/views/rooms/_JumpToBottomButton.pcss
View File

@ -39,13 +39,12 @@ limitations under the License.
/* with text-align in parent */
display: inline-block;
padding: 0 4px;
color: $accent-fg-color;
background-color: $muted-fg-color;
color: var(--cpd-color-text-on-solid-primary);
background-color: var(--cpd-color-icon-secondary);
}
.mx_JumpToBottomButton_highlight .mx_JumpToBottomButton_badge {
color: $secondary-accent-color;
background-color: $alert;
background-color: var(--cpd-color-icon-critical-primary);
}
.mx_JumpToBottomButton_scrollDown {
@ -55,7 +54,7 @@ limitations under the License.
border-radius: 19px;
box-sizing: border-box;
background: $background;
border: 1.3px solid $muted-fg-color;
border: 1.3px solid var(--cpd-color-icon-tertiary);
cursor: pointer;
}
@ -68,5 +67,5 @@ limitations under the License.
mask-size: 20px;
mask-position: center 6px;
transform: rotate(180deg);
background: $muted-fg-color;
background: var(--cpd-color-icon-tertiary);
}

17
res/css/views/rooms/_LegacyRoomHeader.pcss
View File

@ -185,10 +185,10 @@ limitations under the License.
}
&:hover {
background: $accent-300;
background: var(--cpd-color-bg-subtle-primary);
&::before {
background-color: $accent;
background-color: var(--cpd-color-icon-primary);
}
}
}
@ -213,8 +213,8 @@ limitations under the License.
margin: 4px;
&.mx_Indicator_highlight {
background: $alert;
box-shadow: $alert;
background: var(--cpd-color-icon-critical-primary);
box-shadow: var(--cpd-color-icon-critical-primary);
}
&.mx_Indicator_notification {
@ -223,8 +223,8 @@ limitations under the License.
}
&.mx_Indicator_activity {
background: $primary-content;
box-shadow: $primary-content;
background: var(--cpd-color-icon-primary);
box-shadow: var(--cpd-color-icon-primary);
}
}
@ -234,10 +234,9 @@ limitations under the License.
}
}
.mx_LegacyRoomHeader_button--highlight,
.mx_LegacyRoomHeader_button:hover {
.mx_LegacyRoomHeader_button--highlight {
&::before {
background-color: $accent !important;
background-color: var(--cpd-color-icon-primary) !important;
}
}

2
res/css/views/rooms/_MessageComposer.pcss
View File

@ -191,7 +191,7 @@ limitations under the License.
}
.mx_MessageComposer_button {
@mixin composerButton 50%, var(--cpd-color-icon-secondary), var(--cpd-color-bg-subtle-secondary);
@mixin composerButton 50%, var(--cpd-color-icon-primary), var(--cpd-color-bg-subtle-primary);
&:last-child {
margin-right: auto;

5
res/css/views/rooms/_NotificationBadge.pcss
View File

@ -39,7 +39,7 @@ limitations under the License.
width: 8px;
height: 8px;
border-radius: 8px;
background-color: var(--cpd-color-text-primary);
background-color: var(--cpd-color-icon-primary);
.mx_NotificationBadge_count {
display: none;
@ -86,7 +86,8 @@ limitations under the License.
.mx_NotificationBadge_count {
font-size: $font-10px;
line-height: $font-14px;
color: #fff; /* TODO: Variable */
font-weight: var(--cpd-font-weight-semibold);
color: var(--cpd-color-text-on-solid-primary);
}
}
}

4
res/css/views/rooms/_RoomSublist.pcss
View File

@ -118,7 +118,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background: $muted-fg-color;
background: var(--cpd-color-icon-secondary);
}
}
@ -167,7 +167,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background-color: $tertiary-content;
background-color: var(--cpd-color-icon-secondary);
mask-image: url("$(res)/img/feather-customised/chevron-down.svg");
}

2
res/css/views/rooms/_RoomTile.pcss
View File

@ -131,7 +131,7 @@ limitations under the License.
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background: $primary-content;
background: var(--cpd-color-icon-primary);
}
}

8
res/css/views/rooms/_TopUnreadMessagesBar.pcss
View File

@ -40,7 +40,7 @@ limitations under the License.
border-radius: 19px;
box-sizing: border-box;
background: $background;
border: 1.3px solid $muted-fg-color;
border: 1.3px solid var(--cpd-color-icon-tertiary);
cursor: pointer;
}
@ -53,7 +53,7 @@ limitations under the License.
mask-repeat: no-repeat;
mask-size: 20px;
mask-position: center;
background: $muted-fg-color;
background: var(--cpd-color-icon-tertiary);
}
.mx_TopUnreadMessagesBar_markAsRead {
@ -61,7 +61,7 @@ limitations under the License.
width: 18px;
height: 18px;
background: $background;
border: 1.3px solid $muted-fg-color;
border: 1.3px solid var(--cpd-color-icon-tertiary);
border-radius: 10px;
margin: 5px auto;
}
@ -75,5 +75,5 @@ limitations under the License.
mask-repeat: no-repeat;
mask-size: 10px;
mask-position: 4px 4px;
background: $muted-fg-color;
background: var(--cpd-color-icon-tertiary);
}

2
res/css/views/rooms/wysiwyg_composer/components/_Editor.pcss
View File

@ -115,7 +115,7 @@ limitations under the License.
max-width: 100%;
overflow: hidden;
color: $accent-fg-color;
color: var(--cpd-color-text-on-solid-primary);
background-color: $pill-bg-color;
/* ...with the overrides from _BasicMessageComposer.pcss */