matrix-org · robintown · Feb 15, 2024 · florianduros · Feb 19, 2024
@@ -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 & {
@@ -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);
 }
 

@@ -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,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;
     }
 

@@ -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;
 

@@ -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);
 }
@@ -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);
 }
@@ -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,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;
 }
@@ -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 */

@@ -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);
 /* ******************** */
 
 /**
@@ -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 */
@@ -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 */
@@ -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 */

@@ -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;
@@ -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 */
 /* ******************** */