matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-31 13:44:28 +03:00
Code Activity

Revert "Use Compound primary colors for most actions" (#12264)

Browse Source 
* Revert ed5ef023b2

* Update failing snapshots

* Update snapshots after develop merge
This commit is contained in:
Florian Duros
2024-02-20 17:24:40 +01:00
committed by GitHub
parent d20e9e4f8e
commit 96a33b800a
87 changed files with 99 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
res/css/views/elements/_AccessibleButton.pcss
View File

@ -42,7 +42,7 @@ limitations under the License.
display: inline-flex;
align-items: center;
justify-content: center;
font: var(--cpd-font-body-md-semibold);
font: var(--cpd-font-body-md-regular);
border: none; /* override default <button /> styles */
word-break: keep-all; /* prevent button text in Chinese/Japanese/Korean (CJK) from being collapsed */
@ -53,23 +53,21 @@ limitations under the License.
}
&.mx_AccessibleButton_kind_primary_sm {
color: var(--cpd-color-text-on-solid-primary);
background-color: var(--cpd-color-bg-action-primary-rest);
color: $button-primary-fg-color;
background-color: $accent;
}
&.mx_AccessibleButton_kind_danger_sm {
color: var(--cpd-color-text-on-solid-primary);
background-color: var(--cpd-color-bg-critical-primary);
color: $button-danger-fg-color;
background-color: $alert;
}
&.mx_AccessibleButton_kind_link_sm {
color: var(--cpd-color-text-primary);
text-decoration: underline;
font-weight: var(--cpd-font-weight-semibold);
color: $accent;
}
&.mx_AccessibleButton_kind_confirm_sm {
background-color: var(--cpd-color-bg-action-primary-rest);
background-color: $accent;
&::before {
mask-image: url("$(res)/img/feather-customised/check.svg");
@ -77,7 +75,7 @@ limitations under the License.
}
&.mx_AccessibleButton_kind_cancel_sm {
background-color: var(--cpd-color-bg-critical-primary);
background-color: $alert;
&::before {
mask-image: url("$(res)/img/feather-customised/x.svg");
@ -101,22 +99,26 @@ limitations under the License.
font-weight: var(--cpd-font-weight-semibold);
}
&.mx_AccessibleButton_kind_icon_primary,
&.mx_AccessibleButton_kind_icon_primary_outline,
&.mx_AccessibleButton_kind_primary,
&.mx_AccessibleButton_kind_primary_outline {
border: 1px solid $accent;
}
&.mx_AccessibleButton_kind_icon_primary,
&.mx_AccessibleButton_kind_primary {
border: 1px solid var(--cpd-color-bg-action-primary-rest);
color: var(--cpd-color-text-on-solid-primary);
background-color: var(--cpd-color-bg-action-primary-rest);
color: $button-primary-fg-color;
background-color: $accent;
}
&.mx_AccessibleButton_kind_icon_primary_outline,
&.mx_AccessibleButton_kind_primary_outline {
border: 1px solid var(--cpd-color-border-interactive-secondary);
color: var(--cpd-color-text-primary);
color: $accent;
}
&.mx_AccessibleButton_kind_secondary {
color: var(--cpd-color-text-primary);
text-decoration: underline;
color: $accent;
}
&.mx_AccessibleButton_kind_secondary_content {
@ -124,30 +126,30 @@ limitations under the License.
}
&.mx_AccessibleButton_kind_danger {
color: var(--cpd-color-text-on-solid-primary);
background-color: var(--cpd-color-bg-critical-primary);
color: $button-danger-fg-color;
background-color: $alert;
&.mx_AccessibleButton_disabled {
color: var(--cpd-color-text-on-solid-primary);
background-color: var(--cpd-color-bg-critical-primary);
color: $button-danger-disabled-fg-color;
background-color: $button-danger-disabled-bg-color;
}
}
&.mx_AccessibleButton_kind_danger_outline {
color: var(--cpd-color-text-critical-primary);
color: $alert;
background-color: transparent;
border: 1px solid var(--cpd-color-border-critical-primary);
border: 1px solid $alert;
&.mx_AccessibleButton_disabled {
color: var(--cpd-color-text-disabled);
border-color: var(--cpd-color-border-disabled);
color: $button-danger-disabled-bg-color;
border-color: $button-danger-disabled-bg-color;
}
}
&.mx_AccessibleButton_kind_danger_sm {
&.mx_AccessibleButton_disabled {
color: var(--cpd-color-text-disabled);
background-color: var(--cpd-color-bg-subtle-primary);
color: $button-danger-disabled-fg-color;
background-color: $button-danger-disabled-bg-color;
}
}
@ -156,19 +158,18 @@ limitations under the License.
&.mx_AccessibleButton_kind_danger_inline,
&.mx_AccessibleButton_kind_content_inline {
font-size: inherit;
font-weight: var(--cpd-font-weight-semibold);
font-weight: normal;
line-height: inherit;
padding: 0;
text-decoration: underline;
}
&.mx_AccessibleButton_kind_link,
&.mx_AccessibleButton_kind_link_inline {
color: var(--cpd-color-text-primary);
color: $accent;
}
&.mx_AccessibleButton_kind_danger_inline {
color: var(--cpd-color-text-critical-primary);
color: $alert;
}
&.mx_AccessibleButton_kind_content_inline {

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

@ -19,10 +19,10 @@ progress.mx_ProgressBar {
width: 60px;
overflow: hidden;
appearance: none;
border: var(--cpd-border-width-1) solid var(--cpd-color-gray-400);
border: none;
@mixin ProgressBarBorderRadius 6px;
@mixin ProgressBarColour var(--cpd-color-icon-accent-tertiary);
@mixin ProgressBarColour $accent;
@mixin ProgressBarBgColour $progressbar-bg-color;
::-webkit-progress-value {
transition: width 1s;

2
res/css/views/elements/_ReplyChain.pcss
View File

@ -25,8 +25,6 @@ limitations under the License.
white-space: nowrap; /* Enforce 'In reply to' to be a single line */
color: $secondary-content;
transition: color ease 0.15s;
font-weight: var(--cpd-font-weight-normal);
text-decoration: inherit;
&:hover {
color: $primary-content;

2
res/css/views/elements/_Slider.pcss
View File

@ -26,7 +26,7 @@ limitations under the License.
background: none;
font-size: 1em; /* set base multiplier for em units applied later */
--active-color: var(--cpd-color-bg-action-primary-rest);
--active-color: $accent;
--selection-dot-size: 2.4em;
&:disabled {

12
res/css/views/elements/_StyledCheckbox.pcss
View File

@ -42,7 +42,7 @@ limitations under the License.
height: $size;
width: $size;
size: 0.5rem;
border: 1px solid var(--cpd-color-border-interactive-primary);
border: 1px solid $strong-input-border-color;
box-sizing: border-box;
border-radius: $border-radius;
@ -80,12 +80,12 @@ limitations under the License.
.mx_Checkbox.mx_Checkbox_kind_solid input[type="checkbox"] {
& + label > .mx_Checkbox_background .mx_Checkbox_checkmark {
background: var(--cpd-color-icon-on-solid-primary);
background: #ffffff;
}
&:checked + label > .mx_Checkbox_background {
background: var(--cpd-color-bg-action-primary-rest);
border-color: var(--cpd-color-bg-action-primary-rest);
background: $accent;
border-color: $accent;
}
&:checked:disabled + label > .mx_Checkbox_background {
@ -95,11 +95,11 @@ limitations under the License.
.mx_Checkbox.mx_Checkbox_kind_outline input[type="checkbox"] {
& + label > .mx_Checkbox_background .mx_Checkbox_checkmark {
background: var(--cpd-color-bg-action-primary-rest);
background: $accent;
}
&:checked + label > .mx_Checkbox_background {
background: transparent;
border-color: var(--cpd-color-bg-action-primary-rest);
border-color: $accent;
}
}

6
res/css/views/elements/_StyledRadioButton.pcss
View File

@ -20,8 +20,8 @@ limitations under the License.
*/
.mx_StyledRadioButton {
$radio-circle-color: var(--cpd-color-border-interactive-primary);
$active-radio-circle-color: var(--cpd-color-bg-action-primary-rest);
$radio-circle-color: $strong-input-border-color;
$active-radio-circle-color: $accent;
position: relative;
display: flex;
@ -126,5 +126,5 @@ limitations under the License.
}
.mx_StyledRadioButton_checked {
border-color: var(--cpd-color-bg-action-primary-rest);
border-color: $accent;
}