From d39709c1b31513eb613d8be811314b8cdf9c41fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nil=C3=A9ane?= Date: Thu, 16 Nov 2023 15:13:02 +0100 Subject: [PATCH] Fixed media double border ; follow requests header --- TangerineUI-purple.css | 12 ++++++++---- TangerineUI.css | 12 ++++++++---- .../tangerineui-purple/layout-single-column.scss | 12 ++++++++---- .../styles/tangerineui/layout-single-column.scss | 12 ++++++++---- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/TangerineUI-purple.css b/TangerineUI-purple.css index 7bc4bd8..db3163e 100644 --- a/TangerineUI-purple.css +++ b/TangerineUI-purple.css @@ -12,7 +12,7 @@ /* 🎨 Colors */ :root { - --color-bg: #ffffff; + --color-bg: #ffffff /* #f2eff5 */; --color-fg: #2a2d37; --color-fg-muted: #888494; --color-secondary-bg: #e8e4f2; @@ -602,7 +602,8 @@ body.layout-single-column { .layout-single-column .active .icon-user-plus { background-image: var(--icon-user-plus); } -.layout-single-column .column-link.active .icon-user-plus { +.layout-single-column .column-link.active .icon-user-plus, +.layout-single-column .column-header__icon.icon-user-plus { background-image: var(--icon-user-plus-active); } /* Users icon */ @@ -1730,8 +1731,6 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu .layout-single-column .audio-player, .layout-single-column .media-gallery, -.layout-single-column .media-gallery__gifv, -.layout-single-column .media-gallery__preview, .layout-single-column .video-player { border: 1px solid var(--color-lines); } @@ -1980,6 +1979,11 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu height: 50px; } } +@media screen and (min-width:1175px) { + .layout-single-column .column-back-button--slim-button { + display: none; + } +} .layout-single-column .load-gap, .layout-single-column .load-more { diff --git a/TangerineUI.css b/TangerineUI.css index 3ac29f3..74a39a6 100644 --- a/TangerineUI.css +++ b/TangerineUI.css @@ -12,7 +12,7 @@ /* 🎨 Colors */ :root { - --color-bg: #ffffff; + --color-bg: #ffffff /* #f5f2ef */; --color-fg: #2a2d37; --color-fg-muted: #948c84; --color-secondary-bg: #f2eae4; @@ -602,7 +602,8 @@ body.layout-single-column { .layout-single-column .active .icon-user-plus { background-image: var(--icon-user-plus); } -.layout-single-column .column-link.active .icon-user-plus { +.layout-single-column .column-link.active .icon-user-plus, +.layout-single-column .column-header__icon.icon-user-plus { background-image: var(--icon-user-plus-active); } /* Users icon */ @@ -1730,8 +1731,6 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu .layout-single-column .audio-player, .layout-single-column .media-gallery, -.layout-single-column .media-gallery__gifv, -.layout-single-column .media-gallery__preview, .layout-single-column .video-player { border: 1px solid var(--color-lines); } @@ -1980,6 +1979,11 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu height: 50px; } } +@media screen and (min-width:1175px) { + .layout-single-column .column-back-button--slim-button { + display: none; + } +} .layout-single-column .load-gap, .layout-single-column .load-more { 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 7bc4bd8..db3163e 100644 --- a/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss +++ b/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss @@ -12,7 +12,7 @@ /* 🎨 Colors */ :root { - --color-bg: #ffffff; + --color-bg: #ffffff /* #f2eff5 */; --color-fg: #2a2d37; --color-fg-muted: #888494; --color-secondary-bg: #e8e4f2; @@ -602,7 +602,8 @@ body.layout-single-column { .layout-single-column .active .icon-user-plus { background-image: var(--icon-user-plus); } -.layout-single-column .column-link.active .icon-user-plus { +.layout-single-column .column-link.active .icon-user-plus, +.layout-single-column .column-header__icon.icon-user-plus { background-image: var(--icon-user-plus-active); } /* Users icon */ @@ -1730,8 +1731,6 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu .layout-single-column .audio-player, .layout-single-column .media-gallery, -.layout-single-column .media-gallery__gifv, -.layout-single-column .media-gallery__preview, .layout-single-column .video-player { border: 1px solid var(--color-lines); } @@ -1980,6 +1979,11 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu height: 50px; } } +@media screen and (min-width:1175px) { + .layout-single-column .column-back-button--slim-button { + display: none; + } +} .layout-single-column .load-gap, .layout-single-column .load-more { diff --git a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss index 3ac29f3..74a39a6 100644 --- a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss +++ b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss @@ -12,7 +12,7 @@ /* 🎨 Colors */ :root { - --color-bg: #ffffff; + --color-bg: #ffffff /* #f5f2ef */; --color-fg: #2a2d37; --color-fg-muted: #948c84; --color-secondary-bg: #f2eae4; @@ -602,7 +602,8 @@ body.layout-single-column { .layout-single-column .active .icon-user-plus { background-image: var(--icon-user-plus); } -.layout-single-column .column-link.active .icon-user-plus { +.layout-single-column .column-link.active .icon-user-plus, +.layout-single-column .column-header__icon.icon-user-plus { background-image: var(--icon-user-plus-active); } /* Users icon */ @@ -1730,8 +1731,6 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu .layout-single-column .audio-player, .layout-single-column .media-gallery, -.layout-single-column .media-gallery__gifv, -.layout-single-column .media-gallery__preview, .layout-single-column .video-player { border: 1px solid var(--color-lines); } @@ -1980,6 +1979,11 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu height: 50px; } } +@media screen and (min-width:1175px) { + .layout-single-column .column-back-button--slim-button { + display: none; + } +} .layout-single-column .load-gap, .layout-single-column .load-more {