sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Color cleanup number six (#7050)

Browse Source 
* Remove $voip-decline-color and $voip-accept-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $dialog-background-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $mention-user-pill-bg-color -> $warning-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $plinth-bg-color -> $secondary-accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $input-lighter-fg-color -> $input-darker-fg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $input-valid-border-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $input-invalid-border-color -> $warning-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $button-bg-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $avatar-bg-color -> $background

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $preview-widget-fg-color -> $greyed-fg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $settings-profile-button-fg-color -> $settings-profile-overlay-placeholder-fg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $presence-online -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $pinned-unread-color -> $notice-primary-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $event-highlight-fg-color -> $warning-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $tab-label-active-bg-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $button-primary-bg-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $button-danger-bg-color -> $notice-primary-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $button-link-fg-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $togglesw-on-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $slider-selection-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $progressbar-fg-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $authpage-body-bg-color -> $background

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Fix merge issue

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Fix second merge issue

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2021-11-08 11:50:53 +00:00
committed by GitHub
parent f08c0b3592
commit 07d9e93d67
35 changed files with 65 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/css/views/elements/_AccessibleButton.scss
+13 -13
View File
@@ -35,15 +35,15 @@ limitations under the License.
.mx_AccessibleButton_kind_primary {
color: $button-primary-fg-color;
background-color: $button-primary-bg-color;
border: 1px solid $button-primary-bg-color; // account for size loss of no border
background-color: $accent-color;
border: 1px solid $accent-color; // account for size loss of no border
font-weight: 600;
}
.mx_AccessibleButton_kind_primary_outline {
color: $button-primary-bg-color;
color: $accent-color;
background-color: $button-secondary-bg-color;
border: 1px solid $button-primary-bg-color;
border: 1px solid $accent-color;
font-weight: 600;
}
@@ -60,7 +60,7 @@ limitations under the License.
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_primary_sm {
padding: 5px 12px;
color: $button-primary-fg-color;
background-color: $button-primary-bg-color;
background-color: $accent-color;
}
.mx_AccessibleButton_kind_primary_sm.mx_AccessibleButton_disabled {
@@ -69,13 +69,13 @@ limitations under the License.
.mx_AccessibleButton_kind_danger {
color: $button-danger-fg-color;
background-color: $button-danger-bg-color;
background-color: $notice-primary-color;
}
.mx_AccessibleButton_kind_danger_outline {
color: $button-danger-bg-color;
color: $notice-primary-color;
background-color: transparent;
border: 1px solid $button-danger-bg-color;
border: 1px solid $notice-primary-color;
}
.mx_AccessibleButton_kind_danger.mx_AccessibleButton_disabled {
@@ -91,7 +91,7 @@ limitations under the License.
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_danger_sm {
padding: 5px 12px;
color: $button-danger-fg-color;
background-color: $button-danger-bg-color;
background-color: $notice-primary-color;
}
.mx_AccessibleButton_kind_danger_sm.mx_AccessibleButton_disabled {
@@ -100,7 +100,7 @@ limitations under the License.
}
.mx_AccessibleButton_kind_link {
color: $button-link-fg-color;
color: $accent-color;
background-color: $button-link-bg-color;
}
@@ -110,7 +110,7 @@ limitations under the License.
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_link_sm {
padding: 5px 12px;
color: $button-link-fg-color;
color: $accent-color;
background-color: $button-link-bg-color;
}
@@ -119,7 +119,7 @@ limitations under the License.
}
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_confirm_sm {
background-color: $button-primary-bg-color;
background-color: $accent-color;
&::before {
mask-image: url('$(res)/img/feather-customised/check.svg');
@@ -127,7 +127,7 @@ limitations under the License.
}
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_cancel_sm {
background-color: $button-danger-bg-color;
background-color: $notice-primary-color;
&::before {
mask-image: url('$(res)/img/feather-customised/x.svg');
res/css/views/elements/_DirectorySearchBox.scss
+1 -1
View File
@@ -25,7 +25,7 @@ limitations under the License.
padding: 3px;
padding-left: 10px;
padding-right: 10px;
background-color: $plinth-bg-color;
background-color: $secondary-accent-color;
border-radius: 3px;
background-image: url('$(res)/img/icon-return.svg');
background-position: 8px 70%;
res/css/views/elements/_Field.scss
+4 -4
View File
@@ -152,24 +152,24 @@ limitations under the License.
.mx_Field_valid {
&.mx_Field,
&.mx_Field:focus-within {
border-color: $input-valid-border-color;
border-color: $accent-color;
}
&.mx_Field label,
&.mx_Field:focus-within label {
color: $input-valid-border-color;
color: $accent-color;
}
}
.mx_Field_invalid {
&.mx_Field,
&.mx_Field:focus-within {
border-color: $input-invalid-border-color;
border-color: $warning-color;
}
&.mx_Field label,
&.mx_Field:focus-within label {
color: $input-invalid-border-color;
color: $warning-color;
}
}
res/css/views/elements/_ProgressBar.scss
+1 -1
View File
@@ -22,7 +22,7 @@ progress.mx_ProgressBar {
border: none;
@mixin ProgressBarBorderRadius 6px;
@mixin ProgressBarColour $progressbar-fg-color;
@mixin ProgressBarColour $accent-color;
@mixin ProgressBarBgColour $progressbar-bg-color;
::-webkit-progress-value {
transition: width 1s;
res/css/views/elements/_ReplyChain.scss
+1 -1
View File
@@ -20,7 +20,7 @@ limitations under the License.
margin-right: 0;
margin-bottom: 8px;
padding: 0 10px;
border-left: 2px solid $button-bg-color;
border-left: 2px solid $accent-color;
border-radius: 2px;
.mx_ReplyChain_show {
res/css/views/elements/_RichText.scss
+1 -1
View File
@@ -57,7 +57,7 @@ a.mx_Pill {
.mx_EventTile_content .mx_AtRoomPill,
.mx_MessageComposer_input .mx_AtRoomPill {
color: $accent-fg-color;
background-color: $mention-user-pill-bg-color;
background-color: $warning-color;
}
/* More specific to override `.markdown-body a` color */
res/css/views/elements/_SSOButtons.scss
+3 -3
View File
@@ -46,13 +46,13 @@ limitations under the License.
}
.mx_SSOButton_default {
color: $button-primary-bg-color;
color: $accent-color;
background-color: $button-secondary-bg-color;
border-color: $button-primary-bg-color;
border-color: $accent-color;
}
.mx_SSOButton_default.mx_SSOButton_primary {
color: $button-primary-fg-color;
background-color: $button-primary-bg-color;
background-color: $accent-color;
}
.mx_SSOButton_mini {
res/css/views/elements/_Slider.scss
+3 -3
View File
@@ -56,7 +56,7 @@ limitations under the License.
position: absolute;
width: $slider-selection-dot-size;
height: $slider-selection-dot-size;
background-color: $slider-selection-color;
background-color: $accent-color;
border-radius: 50%;
z-index: 10;
}
@@ -72,7 +72,7 @@ limitations under the License.
.mx_Slider_selection > hr {
margin: 0;
border: 0.2em solid $slider-selection-color;
border: 0.2em solid $accent-color;
}
.mx_Slider_dot {
@@ -84,7 +84,7 @@ limitations under the License.
}
.mx_Slider_dotActive {
background-color: $slider-selection-color;
background-color: $accent-color;
}
.mx_Slider_dotValue {
res/css/views/elements/_ToggleSwitch.scss
+1 -1
View File
@@ -32,7 +32,7 @@ limitations under the License.
}
.mx_ToggleSwitch.mx_ToggleSwitch_on {
background-color: $togglesw-on-color;
background-color: $accent-color;
> .mx_ToggleSwitch_ball {
left: calc(100% - $font-20px);
res/css/views/elements/_Validation.scss
+4 -4
View File
@@ -50,20 +50,20 @@ limitations under the License.
}
&.mx_Validation_valid {
color: $input-valid-border-color;
color: $accent-color;
&::before {
mask-image: url('$(res)/img/feather-customised/check.svg');
background-color: $input-valid-border-color;
background-color: $accent-color;
}
}
&.mx_Validation_invalid {
color: $input-invalid-border-color;
color: $warning-color;
&::before {
mask-image: url('$(res)/img/feather-customised/x.svg');
background-color: $input-invalid-border-color;
background-color: $warning-color;
}
}
}