mirror of
https://github.com/discourse/discourse.git
synced 2025-05-24 02:22:40 +08:00
DEV: Fix mixed-decls
sass deprecations in plugins (#31356)
A follow-up to #31343. ``` WARNING: Sass's behavior for declarations that appear after nested rules will be changing to match the behavior specified by CSS in an upcoming version. To keep the existing behavior, move the declaration above the nested rule. To opt into the new behavior, wrap the declaration in `& {}`. More info: https://sass-lang.com/d/mixed-decls ```
This commit is contained in:
@ -75,12 +75,13 @@ html.ios-device.keyboard-visible body #main-outlet .full-page-chat {
|
|||||||
|
|
||||||
.header-dropdown-toggle.chat-header-icon .icon {
|
.header-dropdown-toggle.chat-header-icon .icon {
|
||||||
.chat-channel-unread-indicator {
|
.chat-channel-unread-indicator {
|
||||||
@include chat-unread-indicator;
|
|
||||||
border: 2px solid var(--header_background);
|
border: 2px solid var(--header_background);
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
right: 2px;
|
right: 2px;
|
||||||
|
|
||||||
|
@include chat-unread-indicator;
|
||||||
|
|
||||||
&.-urgent {
|
&.-urgent {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
@ -23,14 +23,16 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.chat-channel-unread-indicator {
|
.chat-channel-unread-indicator {
|
||||||
@include chat-unread-indicator;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
width: 8px;
|
|
||||||
height: 8px;
|
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
|
|
||||||
|
@include chat-unread-indicator {
|
||||||
|
width: 8px;
|
||||||
|
height: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
&.-urgent {
|
&.-urgent {
|
||||||
width: auto;
|
width: auto;
|
||||||
height: auto;
|
height: auto;
|
||||||
|
@ -1,13 +1,14 @@
|
|||||||
.chat-composer-button {
|
.chat-composer-button {
|
||||||
@include breakpoint(mobile-large) {
|
|
||||||
width: 50px;
|
|
||||||
}
|
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
border: 0;
|
border: 0;
|
||||||
height: 50px;
|
height: 50px;
|
||||||
background: none;
|
background: none;
|
||||||
padding-inline: 0.75rem;
|
padding-inline: 0.75rem;
|
||||||
|
|
||||||
|
@include breakpoint(mobile-large) {
|
||||||
|
width: 50px;
|
||||||
|
}
|
||||||
|
|
||||||
.is-disabled & {
|
.is-disabled & {
|
||||||
cursor: not-allowed;
|
cursor: not-allowed;
|
||||||
}
|
}
|
||||||
|
@ -86,10 +86,11 @@
|
|||||||
margin: 5px 0;
|
margin: 5px 0;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
cursor: inherit;
|
cursor: inherit;
|
||||||
@include chat-scrollbar;
|
|
||||||
white-space: pre-wrap !important;
|
white-space: pre-wrap !important;
|
||||||
min-width: 20px;
|
min-width: 20px;
|
||||||
|
|
||||||
|
@include chat-scrollbar;
|
||||||
|
|
||||||
&[disabled] {
|
&[disabled] {
|
||||||
background: none;
|
background: none;
|
||||||
|
|
||||||
@ -103,7 +104,6 @@
|
|||||||
outline: none;
|
outline: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
&:placeholder-shown,
|
|
||||||
&::placeholder {
|
&::placeholder {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
|
@ -94,7 +94,6 @@ html.rtl {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.chat-drawer-content {
|
.chat-drawer-content {
|
||||||
@include chat-scrollbar;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
@ -104,6 +103,8 @@ html.rtl {
|
|||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
overscroll-behavior: contain;
|
overscroll-behavior: contain;
|
||||||
|
|
||||||
|
@include chat-scrollbar;
|
||||||
|
|
||||||
.c-channel-settings {
|
.c-channel-settings {
|
||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
|
|
||||||
|
@ -29,13 +29,10 @@
|
|||||||
.channels-list,
|
.channels-list,
|
||||||
.channels-list-container {
|
.channels-list-container {
|
||||||
position: relative;
|
position: relative;
|
||||||
@include chat-scrollbar;
|
|
||||||
height: 100%;
|
height: 100%;
|
||||||
padding-bottom: 1rem;
|
padding-bottom: 1rem;
|
||||||
|
|
||||||
@include breakpoint(mobile-large) {
|
@include chat-scrollbar;
|
||||||
@include chat-scrollbar;
|
|
||||||
}
|
|
||||||
|
|
||||||
.open-browse-page-btn,
|
.open-browse-page-btn,
|
||||||
.open-draft-channel-page-btn,
|
.open-draft-channel-page-btn,
|
||||||
|
@ -47,14 +47,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&__member {
|
&__member {
|
||||||
@media (prefers-reduced-motion: no-preference) {
|
|
||||||
animation: popIn 0.1s ease-out;
|
|
||||||
}
|
|
||||||
padding: 0 0.25rem;
|
padding: 0 0.25rem;
|
||||||
border-radius: var(--border-radius);
|
border-radius: var(--border-radius);
|
||||||
background: var(--primary-very-low);
|
background: var(--primary-very-low);
|
||||||
gap: 0.25rem;
|
gap: 0.25rem;
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion: no-preference) {
|
||||||
|
animation: popIn 0.1s ease-out;
|
||||||
|
}
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
.discourse-no-touch & {
|
.discourse-no-touch & {
|
||||||
background: var(--primary-very-low);
|
background: var(--primary-very-low);
|
||||||
|
@ -7,8 +7,10 @@
|
|||||||
z-index: 1;
|
z-index: 1;
|
||||||
margin: 0 1px 0 0;
|
margin: 0 1px 0 0;
|
||||||
will-change: transform;
|
will-change: transform;
|
||||||
@include chat-scrollbar;
|
|
||||||
min-height: 1px;
|
min-height: 1px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
transition: padding-top 0.2s ease-in-out;
|
|
||||||
|
@include chat-scrollbar {
|
||||||
|
transition: scrollbar-color 0.25s ease-in-out, padding-top 0.2s ease-in-out;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -21,15 +21,16 @@
|
|||||||
|
|
||||||
&__copy-success {
|
&__copy-success {
|
||||||
animation: chat-quote-message-background-fade-highlight 2s ease-out 3s;
|
animation: chat-quote-message-background-fade-highlight 2s ease-out 3s;
|
||||||
@media (prefers-reduced-motion) {
|
|
||||||
animation-duration: 0s;
|
|
||||||
}
|
|
||||||
animation-fill-mode: forwards;
|
animation-fill-mode: forwards;
|
||||||
background-color: var(--success-low);
|
background-color: var(--success-low);
|
||||||
color: var(--primary);
|
color: var(--primary);
|
||||||
flex: 1;
|
flex: 1;
|
||||||
line-height: normal;
|
line-height: normal;
|
||||||
padding: 0.5rem 0.65rem;
|
padding: 0.5rem 0.65rem;
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion) {
|
||||||
|
animation-duration: 0s;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes chat-quote-message-background-fade-highlight {
|
@keyframes chat-quote-message-background-fade-highlight {
|
||||||
|
@ -128,10 +128,11 @@
|
|||||||
rgba(var(--chat-skeleton-animation-rgb), 0.3) 50%,
|
rgba(var(--chat-skeleton-animation-rgb), 0.3) 50%,
|
||||||
rgba(var(--chat-skeleton-animation-rgb), 0.5) 100%
|
rgba(var(--chat-skeleton-animation-rgb), 0.5) 100%
|
||||||
);
|
);
|
||||||
|
content: "";
|
||||||
|
|
||||||
@media (prefers-reduced-motion: no-preference) {
|
@media (prefers-reduced-motion: no-preference) {
|
||||||
animation: shimmer 1.25s infinite;
|
animation: shimmer 1.25s infinite;
|
||||||
}
|
}
|
||||||
content: "";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes shimmer {
|
@keyframes shimmer {
|
||||||
|
@ -1,13 +1,14 @@
|
|||||||
.chat-thread-header-unread-indicator,
|
.chat-thread-header-unread-indicator,
|
||||||
.chat-thread-list-item-unread-indicator {
|
.chat-thread-list-item-unread-indicator {
|
||||||
@include chat-unread-indicator;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
width: auto;
|
|
||||||
height: auto;
|
|
||||||
padding: 0.21em 0.42em;
|
padding: 0.21em 0.42em;
|
||||||
border-radius: 1em;
|
|
||||||
min-width: 0.6em;
|
min-width: 0.6em;
|
||||||
align-self: center;
|
align-self: center;
|
||||||
|
|
||||||
|
@include chat-unread-indicator {
|
||||||
|
width: auto;
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -8,12 +8,13 @@
|
|||||||
|
|
||||||
&__items {
|
&__items {
|
||||||
overflow-y: scroll;
|
overflow-y: scroll;
|
||||||
@include chat-scrollbar;
|
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
overscroll-behavior: contain;
|
overscroll-behavior: contain;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|
||||||
|
@include chat-scrollbar;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__no-threads {
|
&__no-threads {
|
||||||
|
@ -11,6 +11,8 @@
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
transition: border-color linear 0.15s;
|
transition: border-color linear 0.15s;
|
||||||
|
|
||||||
|
@content;
|
||||||
|
|
||||||
&.-urgent {
|
&.-urgent {
|
||||||
background: var(--success);
|
background: var(--success);
|
||||||
color: var(--secondary);
|
color: var(--secondary);
|
||||||
|
@ -5,6 +5,8 @@
|
|||||||
scrollbar-color: transparent var(--scrollbarBg);
|
scrollbar-color: transparent var(--scrollbarBg);
|
||||||
transition: scrollbar-color 0.25s ease-in-out;
|
transition: scrollbar-color 0.25s ease-in-out;
|
||||||
|
|
||||||
|
@content;
|
||||||
|
|
||||||
// chrome, safari
|
// chrome, safari
|
||||||
&::-webkit-scrollbar-thumb {
|
&::-webkit-scrollbar-thumb {
|
||||||
background-color: var(--scrollbarThumbBg);
|
background-color: var(--scrollbarThumbBg);
|
||||||
|
Reference in New Issue
Block a user