Skip to content

Commit

Permalink
Refine the colors of many smaller components
Browse files Browse the repository at this point in the history
This is part 3 of the Compound color refinement work. I've updated the following components to reflect design decisions 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
- Dialogs (corner radius changed to match the new popover styles from matrix-org#12247)
- Tooltips
  • Loading branch information
robintown committed Feb 16, 2024
1 parent db096b7 commit 667bf97
Show file tree
Hide file tree
Showing 73 changed files with 88 additions and 101 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions res/css/_common.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ legend {
padding: 24px;
max-height: 80%;
box-shadow: 2px 15px 30px 0 $dialog-shadow-color;
border-radius: 8px;
border-radius: 12px;
overflow-y: auto;

.mx_Dialog_staticWrapper & {
Expand Down Expand Up @@ -632,7 +632,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);
}

Expand Down
10 changes: 6 additions & 4 deletions res/css/views/elements/_Pill.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

> * {
Expand All @@ -35,20 +35,22 @@ 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 {
background-color: $pill-hover-bg-color !important; /* To override .markdown-body */
}

&.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;
}

Expand Down
4 changes: 2 additions & 2 deletions res/css/views/elements/_Tooltip.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion res/css/views/messages/_DateSeparator.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 2 deletions res/css/views/messages/_TimelineSeparator.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion res/css/views/rooms/_BasicMessageComposer.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 2 additions & 10 deletions res/css/views/rooms/_E2EIcon.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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);
}
}

Expand All @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions res/css/views/rooms/_EventTile.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}

Expand Down
11 changes: 5 additions & 6 deletions res/css/views/rooms/_JumpToBottomButton.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
}

Expand All @@ -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 changes: 8 additions & 9 deletions res/css/views/rooms/_LegacyRoomHeader.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand All @@ -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 {
Expand All @@ -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);
}
}

Expand All @@ -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;
}
}

Expand Down
2 changes: 1 addition & 1 deletion res/css/views/rooms/_MessageComposer.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions res/css/views/rooms/_NotificationBadge.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 changes: 2 additions & 2 deletions res/css/views/rooms/_RoomSublist.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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");
}

Expand Down
2 changes: 1 addition & 1 deletion res/css/views/rooms/_RoomTile.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
8 changes: 4 additions & 4 deletions res/css/views/rooms/_TopUnreadMessagesBar.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -53,15 +53,15 @@ 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 {
display: block;
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;
}
Expand All @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
15 changes: 7 additions & 8 deletions res/themes/dark/css/_dark.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ $separator: var(--cpd-color-alpha-gray-400);
/* ******************** */
$roomlist-bg-color: rgba(38, 40, 45, 0.9);
$roomsublist-skeleton-ui-bg: linear-gradient(180deg, $background 0%, #ffffff00 100%);
$roomtile-default-badge-bg-color: $muted-fg-color;
$roomtile-default-badge-bg-color: var(--cpd-color-icon-secondary);
/* ******************** */

/**
Expand Down Expand Up @@ -125,8 +125,8 @@ $roomheader-addroom-fg-color: $primary-content;

/* Rich-text-editor */
/* ******************** */
$pill-bg-color: $room-highlight-color;
$pill-hover-bg-color: #545a66;
$pill-bg-color: var(--cpd-color-gray-1000);
$pill-hover-bg-color: var(--cpd-color-gray-1100);
/* ******************** */

/* Inputs */
Expand All @@ -150,7 +150,7 @@ $dialog-close-external-color: $primary-content;
/* ******************** */
$system: var(--cpd-color-bg-subtle-secondary);
$roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%);
$roomtile-default-badge-bg-color: $input-darker-fg-color;
$roomtile-default-badge-bg-color: var(--cpd-color-icon-secondary);
/* ******************** */

/* Tabbed views */
Expand Down Expand Up @@ -199,10 +199,9 @@ $voice-record-icon-color: $quaternary-content;

/* Bubble tiles */
/* ******************** */
$eventbubble-self-bg: #133a34;
$eventbubble-others-bg: #21262c;
$eventbubble-bg-hover: #1c2026;
$eventbubble-reply-color: #c1c6cd;
$eventbubble-self-bg: var(--cpd-color-green-300);
$eventbubble-others-bg: var(--cpd-color-gray-300);
$eventbubble-bg-hover: var(--cpd-color-bg-subtle-secondary);
/* ******************** */

/* Lightbox */
Expand Down
5 changes: 2 additions & 3 deletions res/themes/legacy-dark/css/_legacy-dark.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ $light-fg-color: $header-panel-text-secondary-color;
/* used for focusing form controls */
$focus-bg-color: $room-highlight-color;

$pill-bg-color: $room-highlight-color;
$pill-hover-bg-color: #545a66;
$pill-bg-color: var(--cpd-color-gray-1000);
$pill-hover-bg-color: var(--cpd-color-gray-1100);

/* informational plinth */
$info-plinth-bg-color: $header-panel-bg-color;
Expand Down Expand Up @@ -221,7 +221,6 @@ $inlinecode-background-color: #2a3039;
$eventbubble-self-bg: #14322e;
$eventbubble-others-bg: $event-selected-color;
$eventbubble-bg-hover: #1c2026;
$eventbubble-reply-color: #c1c6cd;

/* Location sharing */
/* ******************** */
Expand Down
Loading

0 comments on commit 667bf97

Please sign in to comment.