Refine the colors of some more components (#12343)
* 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:
parent
f765a44b46
commit
26b4d47af1
49 changed files with 63 additions and 76 deletions
|
@ -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;
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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");
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue