From 604a30c542d6caa78b14196fcdbce238853a2672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nil=C3=A9ane?= Date: Fri, 18 Aug 2023 12:54:36 +0200 Subject: [PATCH] Fixes to DMs' specific look --- TangerineUI-purple.css | 13 ++++++++++--- TangerineUI.css | 13 ++++++++++--- .../tangerineui-purple/layout-single-column.scss | 13 ++++++++++--- .../styles/tangerineui/layout-single-column.scss | 13 ++++++++++--- 4 files changed, 40 insertions(+), 12 deletions(-) diff --git a/TangerineUI-purple.css b/TangerineUI-purple.css index 6397e86..47c86cf 100644 --- a/TangerineUI-purple.css +++ b/TangerineUI-purple.css @@ -1456,7 +1456,8 @@ body.layout-single-column { /* Speech bubble look DMs */ .layout-single-column .status-direct .status__content, -.layout-single-column .detailed-status-direct .status__content { +.layout-single-column .detailed-status-direct .status__content, +.layout-single-column .detailed-status__wrapper-direct .status__content { padding: .7em 1.2em .7em 1em; margin-top: 4px; background: var(--color-accent-bg); @@ -1469,20 +1470,26 @@ body.layout-single-column { font-size: 20px; } .layout-single-column .status-direct .fa.fa-at::before, -.layout-single-column .detailed-status-direct .fa.fa-at::before { +.layout-single-column .detailed-status-direct .fa.fa-at::before, +.layout-single-column .detailed-status__wrapper-direct .fa.fa-at::before { background-size: contain; background-repeat: no-repeat; background-image: var(--icon-direct-messages); background-position: center 3px; color: transparent; } -.layout-single-column .detailed-status-direct .fa.fa-at::before { +.layout-single-column .detailed-status-direct .fa.fa-at::before, +.layout-single-column .detailed-status__wrapper-direct .fa.fa-at::before { background-position: center 4px; } .layout-single-column .status-direct.muted .status__content { background: rgba(155, 174, 200, 0.1); border-color: var(--color-lines); } +.layout-single-column .status__wrapper-direct .status__prepend, +.layout-single-column .detailed-status__wrapper-direct .status__prepend { + display: none; +} diff --git a/TangerineUI.css b/TangerineUI.css index 98bca28..1c4d16c 100644 --- a/TangerineUI.css +++ b/TangerineUI.css @@ -1456,7 +1456,8 @@ body.layout-single-column { /* Speech bubble look DMs */ .layout-single-column .status-direct .status__content, -.layout-single-column .detailed-status-direct .status__content { +.layout-single-column .detailed-status-direct .status__content, +.layout-single-column .detailed-status__wrapper-direct .status__content { padding: .7em 1.2em .7em 1em; margin-top: 4px; background: var(--color-accent-bg); @@ -1469,20 +1470,26 @@ body.layout-single-column { font-size: 20px; } .layout-single-column .status-direct .fa.fa-at::before, -.layout-single-column .detailed-status-direct .fa.fa-at::before { +.layout-single-column .detailed-status-direct .fa.fa-at::before, +.layout-single-column .detailed-status__wrapper-direct .fa.fa-at::before { background-size: contain; background-repeat: no-repeat; background-image: var(--icon-direct-messages); background-position: center 3px; color: transparent; } -.layout-single-column .detailed-status-direct .fa.fa-at::before { +.layout-single-column .detailed-status-direct .fa.fa-at::before, +.layout-single-column .detailed-status__wrapper-direct .fa.fa-at::before { background-position: center 4px; } .layout-single-column .status-direct.muted .status__content { background: rgba(155, 174, 200, 0.1); border-color: var(--color-lines); } +.layout-single-column .status__wrapper-direct .status__prepend, +.layout-single-column .detailed-status__wrapper-direct .status__prepend { + display: none; +} diff --git a/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss b/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss index 6397e86..47c86cf 100644 --- a/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss +++ b/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss @@ -1456,7 +1456,8 @@ body.layout-single-column { /* Speech bubble look DMs */ .layout-single-column .status-direct .status__content, -.layout-single-column .detailed-status-direct .status__content { +.layout-single-column .detailed-status-direct .status__content, +.layout-single-column .detailed-status__wrapper-direct .status__content { padding: .7em 1.2em .7em 1em; margin-top: 4px; background: var(--color-accent-bg); @@ -1469,20 +1470,26 @@ body.layout-single-column { font-size: 20px; } .layout-single-column .status-direct .fa.fa-at::before, -.layout-single-column .detailed-status-direct .fa.fa-at::before { +.layout-single-column .detailed-status-direct .fa.fa-at::before, +.layout-single-column .detailed-status__wrapper-direct .fa.fa-at::before { background-size: contain; background-repeat: no-repeat; background-image: var(--icon-direct-messages); background-position: center 3px; color: transparent; } -.layout-single-column .detailed-status-direct .fa.fa-at::before { +.layout-single-column .detailed-status-direct .fa.fa-at::before, +.layout-single-column .detailed-status__wrapper-direct .fa.fa-at::before { background-position: center 4px; } .layout-single-column .status-direct.muted .status__content { background: rgba(155, 174, 200, 0.1); border-color: var(--color-lines); } +.layout-single-column .status__wrapper-direct .status__prepend, +.layout-single-column .detailed-status__wrapper-direct .status__prepend { + display: none; +} diff --git a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss index 98bca28..1c4d16c 100644 --- a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss +++ b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss @@ -1456,7 +1456,8 @@ body.layout-single-column { /* Speech bubble look DMs */ .layout-single-column .status-direct .status__content, -.layout-single-column .detailed-status-direct .status__content { +.layout-single-column .detailed-status-direct .status__content, +.layout-single-column .detailed-status__wrapper-direct .status__content { padding: .7em 1.2em .7em 1em; margin-top: 4px; background: var(--color-accent-bg); @@ -1469,20 +1470,26 @@ body.layout-single-column { font-size: 20px; } .layout-single-column .status-direct .fa.fa-at::before, -.layout-single-column .detailed-status-direct .fa.fa-at::before { +.layout-single-column .detailed-status-direct .fa.fa-at::before, +.layout-single-column .detailed-status__wrapper-direct .fa.fa-at::before { background-size: contain; background-repeat: no-repeat; background-image: var(--icon-direct-messages); background-position: center 3px; color: transparent; } -.layout-single-column .detailed-status-direct .fa.fa-at::before { +.layout-single-column .detailed-status-direct .fa.fa-at::before, +.layout-single-column .detailed-status__wrapper-direct .fa.fa-at::before { background-position: center 4px; } .layout-single-column .status-direct.muted .status__content { background: rgba(155, 174, 200, 0.1); border-color: var(--color-lines); } +.layout-single-column .status__wrapper-direct .status__prepend, +.layout-single-column .detailed-status__wrapper-direct .status__prepend { + display: none; +}