From 5cf05fa67d97a607ead4a89bfeec4de56226866e Mon Sep 17 00:00:00 2001 From: Mike Barnes Date: Sun, 14 Sep 2025 17:01:57 +1000 Subject: [PATCH] Update theme includes for 4.4 --- app/javascript/styles/chinwag-light.scss | 11 ++++++----- app/javascript/styles/chinwag.scss | 6 +++--- app/javascript/styles/classic-light.scss | 7 ++++--- app/javascript/styles/classic.scss | 2 +- app/javascript/styles/tangerineui/chingerine.scss | 15 +++++++-------- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/app/javascript/styles/chinwag-light.scss b/app/javascript/styles/chinwag-light.scss index 0c8318ce5..da1d89a1c 100644 --- a/app/javascript/styles/chinwag-light.scss +++ b/app/javascript/styles/chinwag-light.scss @@ -1,6 +1,7 @@ -@import 'mastodon-light/variables'; -@import 'application'; -@import 'mastodon-light/diff'; +@use 'mastodon-light/variables'; +@use 'mastodon-light/css_variables'; +@use 'application'; +@use 'mastodon-light/diff'; -@import 'tangerineui/tangerineui'; -@import 'tangerineui/chingerine'; +@use 'tangerineui/tangerineui'; +@use 'tangerineui/chingerine'; diff --git a/app/javascript/styles/chinwag.scss b/app/javascript/styles/chinwag.scss index 4044670c5..23cab8187 100644 --- a/app/javascript/styles/chinwag.scss +++ b/app/javascript/styles/chinwag.scss @@ -1,4 +1,4 @@ -@import 'application'; +@use 'application'; -@import 'tangerineui/tangerineui'; -@import 'tangerineui/chingerine'; +@use 'tangerineui/tangerineui'; +@use 'tangerineui/chingerine'; diff --git a/app/javascript/styles/classic-light.scss b/app/javascript/styles/classic-light.scss index 756a12d86..b530616a3 100644 --- a/app/javascript/styles/classic-light.scss +++ b/app/javascript/styles/classic-light.scss @@ -1,3 +1,4 @@ -@import 'mastodon-light/variables'; -@import 'application'; -@import 'mastodon-light/diff'; +@use 'mastodon-light/variables'; +@use 'mastodon-light/css_variables'; +@use 'application'; +@use 'mastodon-light/diff'; diff --git a/app/javascript/styles/classic.scss b/app/javascript/styles/classic.scss index 97a981243..98ccf0d72 100644 --- a/app/javascript/styles/classic.scss +++ b/app/javascript/styles/classic.scss @@ -1 +1 @@ -@import 'application'; +@use 'application'; diff --git a/app/javascript/styles/tangerineui/chingerine.scss b/app/javascript/styles/tangerineui/chingerine.scss index 64bb584e5..144dd020a 100644 --- a/app/javascript/styles/tangerineui/chingerine.scss +++ b/app/javascript/styles/tangerineui/chingerine.scss @@ -1,6 +1,6 @@ /* Chinwag Meta */ :root { - --version-tag: 'cw2'; + --version-tag: 'cw0'; --variant-name: 'Chinwag'; --variant-emoji: '\1F986\00A0'; --variant: var(--variant-emoji) var(--variant-name); @@ -26,7 +26,7 @@ } @media (prefers-color-scheme: dark) { :root { - --color-bg: #111111; + --color-bg: #111; --gradient-bg: linear-gradient(90deg, var(--color-bg), var(--color-bg)); --color-fg: #d6d2e0; --color-fg-muted: #787c77; @@ -34,7 +34,7 @@ --color-secondary-separator: #26232e; --color-content-bg: #171717; --color-content-fg: var(--color-fg); - --color-content-fg-bold: #ffffff; + --color-content-fg-bold: #fff; --color-content-fg-muted: #737373; --color-content-secondary-bg: var(--color-secondary-bg); --color-content-secondary-separator: rgba(64, 62, 89, 40%); @@ -253,12 +253,12 @@ opacity: 1; } -@media screen and (min-width:1175px) { +@media screen and (width >= 1175px) { .app-body .column-link.column-link--logo, .app-body .ui__header__logo { - background-size: 64px auto; - width: 70px; - height: 70px; + background-size: 64px auto; + width: 70px; + height: 70px; } } @@ -269,4 +269,3 @@ .app-body .navigation-bar .account__display-name { font-size: 15px; } -