Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

[GH-15776]Switch center-channel-color-## with center-channel-color-rgb variables #6641

Merged
merged 1 commit into from
Oct 7, 2020
Merged

[GH-15776]Switch center-channel-color-## with center-channel-color-rgb variables #6641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sass/components/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ button {
color: v(center-channel-color-56);

&:hover {
background: v(center-channel-color-08);
background: rgba(var(--center-channel-color-rgb), 0.08);
fill: v(center-channel-color-72);
color: v(center-channel-color-72);
}

&:active,
&--active,
&--active:hover {
background: v(button-bg-08);
background: rgba(var(--center-channel-color-rgb), 0.08);
fill: v(button-bg);
color: v(button-bg);
}
Expand Down
8 changes: 4 additions & 4 deletions sass/components/_emoticons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,12 @@
text-decoration: none;

&:hover {
background-color: v(center-channel-color-04);
background-color: rgba(var(--center-channel-color-rgb), 0.04);
color: v(center-channel-color);
}

&:active {
background-color: v(center-channel-color-16);
background-color: rgba(var(--center-channel-color-rgb), 0.16);
color: v(center-channel-color);
}

Expand Down Expand Up @@ -318,11 +318,11 @@

&.selected,
&:hover {
background-color: v(center-channel-color-16);
background-color: rgba(var(--center-channel-color-rgb), 0.16);
}

&:active {
background-color: v(center-channel-color-32);
background-color: rgba(var(--center-channel-color-rgb), 0.32);
}

> div {
Expand Down
12 changes: 6 additions & 6 deletions sass/components/_popover.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@

&:before {
position: absolute;
background: v(center-channel-color-04) !important;
background: rgba(var(--center-channel-color-rgb), 0.04) !important;
content: '';
width: 100%;
height: 100%;
Expand All @@ -226,7 +226,7 @@
.popover-content {
border-radius: 0 0 3px 3px;
border-top: none;
@include box-shadow(v(center-channel-color-08) 0px 17px 50px 0px, v(center-channel-color-08) 0px 12px 15px 0px);
@include box-shadow(rgba(var(--center-channel-color-rgb), 0.08) 0px 17px 50px 0px, rgba(var(--center-channel-color-rgb), 0.08) 0px 12px 15px 0px);
background: v(center-channel-bg);
}
}
Expand Down Expand Up @@ -286,7 +286,7 @@
&:before {
content: '';
height: 1px;
background: v(center-channel-color-08);
background: rgba(var(--center-channel-color-rgb), 0.08);
position: absolute;
top: -7px;
left: 0;
Expand Down Expand Up @@ -324,7 +324,7 @@

&::-webkit-scrollbar-thumb {
border: 1px solid v(center-channel-bg);
background-color: v(center-channel-color-24) !important;
background-color: rgba(var(--center-channel-color-rgb), 0.24) !important;
border-radius: 4px;
}
}
Expand All @@ -342,12 +342,12 @@
padding: 0 2.4rem;

&.selected {
background: v(center-channel-color-08);
background: rgba(var(--center-channel-color-rgb), 0.08);
box-shadow: none;
}

.status--group {
background-color: v(center-channel-color-20);
background-color: rgba(var(--center-channel-color-rgb), 0.20);
margin: 0;
width: 1.8rem;
height: 1.8rem;
Expand Down