diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index 6cf4db3070..f06cef07ed 100644 --- a/app/javascript/flavours/glitch/styles/admin.scss +++ b/app/javascript/flavours/glitch/styles/admin.scss @@ -1976,60 +1976,77 @@ a.sparkline { box-sizing: border-box; min-height: 100%; + &.status--has-quote { + .quote-inline { + display: none; + } + } + + .status__quote & { + // Remove the border from the .status__card within .status__quote + border: none; + + .display-name__account { + line-height: inherit; + } + + .status__avatar, + .status__avatar .account__avatar { + width: 32px; + height: 32px; + } + } + .status__prepend { padding: 0 0 15px; gap: 4px; align-items: center; } - .status__content { - padding-top: 0; + > details { + summary { + display: block; + box-sizing: border-box; + background: var(--nested-card-background); + color: var(--nested-card-text); + border: var(--nested-card-border); + border-radius: 8px; + padding: 8px 13px; + position: relative; + font-size: 15px; + line-height: 22px; + cursor: pointer; - > details { - summary { + &::after { + content: attr(data-show, 'Show more'); + margin-top: 8px; display: block; - box-sizing: border-box; - background: var(--nested-card-background); - color: var(--nested-card-text); - border: var(--nested-card-border); - border-radius: 8px; - padding: 8px 13px; - position: relative; font-size: 15px; - line-height: 22px; + line-height: 20px; + color: $highlight-text-color; cursor: pointer; - - &::after { - content: attr(data-show, 'Show more'); - margin-top: 8px; - display: block; - font-size: 15px; - line-height: 20px; - color: $highlight-text-color; - cursor: pointer; - border: 0; - background: transparent; - padding: 0; - text-decoration: none; - font-weight: 500; - } - - &:hover, - &:focus-visible { - &::after { - text-decoration: underline !important; - } - } + border: 0; + background: transparent; + padding: 0; + text-decoration: none; + font-weight: 500; } - &[open] summary { - margin-bottom: 16px; - + &:hover, + &:focus-visible { &::after { - content: attr(data-hide, 'Hide post'); + text-decoration: underline !important; } } } + + &[open] summary { + margin-bottom: 16px; + + &::after { + content: attr(data-hide, 'Hide post'); + } + } } .preview-card { @@ -2086,6 +2103,14 @@ a.sparkline { } } } + + .detailed-status__meta { + .detailed-status__application, + .detailed-status__datetime, + .detailed-status__link { + color: inherit; + } + } } .admin { diff --git a/app/javascript/flavours/glitch/styles/tables.scss b/app/javascript/flavours/glitch/styles/tables.scss index 3489d22e5d..e82f2b551c 100644 --- a/app/javascript/flavours/glitch/styles/tables.scss +++ b/app/javascript/flavours/glitch/styles/tables.scss @@ -356,7 +356,7 @@ a.table-action-link { // Reset the status card to not have borders, background or padding when // inline in the table of statuses - .status__card { + .batch-table__row__content > .status__card { border: none; background: none; padding: 0;