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 styles of controls to match Compound (#12299)

Browse Source 
This changes the styles of buttons, other form controls, and tabs in settings to:

1. Improve their usage of semantic colors, so that they adapt correctly to custom themes
2. Make them more visually coherent with the new Compound design system, as we integrate more of it into the app

This is a re-introduction of https://github.com/matrix-org/matrix-react-sdk/pull/12241 with the difference that we're now using our branding colors again on form colors, and buttons have become rounded to match the appearance of new Compound buttons.
This commit is contained in:
Robin
2024-03-04 23:25:47 -05:00
committed by GitHub
parent 5c8b14c53e
commit 6eafe0e5a8
119 changed files with 225 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/css/structures/_SpaceRoomView.pcss
View File

@ -46,10 +46,10 @@ limitations under the License.
}
&:hover {
border-color: $accent;
border-color: var(--cpd-color-bg-interactive-primary-rest);
&::before {
background-color: $accent;
background-color: var(--cpd-color-icon-primary);
}
> span {
@ -212,7 +212,7 @@ limitations under the License.
left: 8px;
height: 16px;
width: 16px;
background: #fff; /* white icon fill */
background: var(--cpd-color-icon-on-solid-primary);
mask-size: 16px;
mask-image: url("$(res)/img/element-icons/room/invite.svg");
}
@ -293,11 +293,13 @@ limitations under the License.
}
.mx_SpaceRoomView_inviteTeammates_inviteDialogButton {
color: $accent;
color: var(--cpd-color-text-primary);
font-weight: var(--cpd-font-weight-semibold);
text-decoration: underline;
&::before {
mask-image: url("$(res)/img/element-icons/room/invite.svg");
background-color: $accent;
background-color: var(--cpd-color-icon-primary);
}
}
}

43
res/css/structures/_TabbedView.pcss
View File

@ -30,37 +30,42 @@ limitations under the License.
position: absolute;
.mx_TabbedView_tabLabels {
width: 170px;
max-width: 170px;
width: 220px;
max-width: 220px;
position: fixed;
margin: 0; /* Remove the default value */
padding: 0; /* Remove the default value */
}
.mx_TabbedView_tabPanel {
margin-left: 240px; /* 170px sidebar + 70px padding */
margin-left: 280px; /* 220px sidebar + 60px padding */
flex-direction: column;
}
.mx_TabbedView_tabLabel:hover,
.mx_TabbedView_tabLabel_active {
background-color: $accent;
color: $tab-label-active-fg-color;
.mx_TabbedView_maskedIcon::before {
background-color: var(--cpd-color-icon-primary);
}
}
.mx_TabbedView_tabLabel_active .mx_TabbedView_maskedIcon::before {
background-color: $tab-label-active-fg-color;
.mx_TabbedView_tabLabel_active {
background-color: var(--cpd-color-bg-subtle-secondary);
}
.mx_TabbedView_maskedIcon {
width: 16px;
height: 16px;
margin-right: 16px;
width: 20px;
height: 20px;
margin-right: var(--cpd-space-3x);
}
.mx_TabbedView_maskedIcon::before {
mask-size: 16px;
width: 16px;
height: 16px;
mask-size: 20px;
width: 20px;
height: 20px;
transition: background-color 0.1s;
}
}
@ -120,10 +125,16 @@ limitations under the License.
align-items: center;
vertical-align: text-top;
cursor: pointer;
padding: 8px;
border-radius: 8px;
font-size: $font-13px;
padding-block: var(--cpd-space-2x);
padding-inline: var(--cpd-space-3x) var(--cpd-space-4x);
box-sizing: border-box;
min-block-size: 40px;
border-radius: 24px;
font: var(--cpd-font-body-md-medium);
position: relative;
transition:
color 0.1s,
background-color 0.1s;
}
.mx_TabbedView_maskedIcon {
@ -132,7 +143,7 @@ limitations under the License.
.mx_TabbedView_maskedIcon::before {
display: inline-block;
background-color: $icon-button-color;
background-color: var(--cpd-color-icon-secondary);
mask-repeat: no-repeat;
mask-position: center;
content: "";

2
res/css/structures/auth/_CompleteSecurity.pcss
View File

@ -35,8 +35,6 @@ limitations under the License.
.mx_CompleteSecurity_skip {
@mixin customisedCancelButton;
width: 18px;
height: 18px;
position: absolute;
right: 24px;
}