tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream

Browse Source 
Too many conflicts to list, because of webpack → vite migration.
This commit is contained in:
Claire committed 2025-05-25 14:36:51 +02:00
2 parents a8ed678761 c4f47adb49
commit f49940db85
159 files changed
+2373 -7784
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/javascript/styles/inert.scss → app/javascript/styles/entrypoints/inert.scss
View File
File renamed without changes.
app/javascript/styles/mailer.scss → app/javascript/styles/entrypoints/mailer.scss
+5 -5
View File
@@ -1,4 +1,4 @@
@use 'fonts/inter';
@use '../fonts/inter';
body {
accent-color: #6364ff;
@@ -259,7 +259,7 @@ table + p {
.email-header-td {
padding: 16px 32px;
background-color: #1b001f;
background-image: url('../images/mailer-new/common/header-bg-start.png');
background-image: url('../../images/mailer-new/common/header-bg-start.png');
background-position: left top;
background-repeat: repeat;
}
@@ -426,7 +426,7 @@ table + p {
// Body content
.email-body-td {
background-image: url('../images/mailer-new/common/header-bg-end.png');
background-image: url('../../images/mailer-new/common/header-bg-end.png');
background-position: left top;
background-repeat: no-repeat;
}
@@ -922,7 +922,7 @@ table + p {
// Extra content on light purple background
.email-extra-wave {
height: 42px;
background-image: url('../images/mailer-new/welcome/purple-extra-soft-wave.png');
background-image: url('../../images/mailer-new/welcome/purple-extra-soft-wave.png');
background-position: bottom center;
background-repeat: no-repeat;
}
@@ -930,7 +930,7 @@ table + p {
.email-extra-td {
padding: 32px 32px 24px;
background-color: #f0f0ff;
background-image: url('../images/mailer-new/welcome/purple-extra-soft-spacer.png'); // Using an image to maintain the color even in forced dark modes
background-image: url('../../images/mailer-new/welcome/purple-extra-soft-spacer.png'); // Using an image to maintain the color even in forced dark modes
.email-column-td {
padding-top: 8px;
app/javascript/styles/fonts/inter.scss
+1 -1
View File
@@ -1,6 +1,6 @@
@font-face {
font-family: Inter;
src: url('../fonts/inter/inter-variable-font-slnt-wght.woff2')
src: url('../../fonts/inter/inter-variable-font-slnt-wght.woff2')
format('woff2-variations');
font-weight: 100 900;
font-style: normal;
app/javascript/styles/fonts/roboto-mono.scss
+4 -4
View File
@@ -2,10 +2,10 @@
font-family: mastodon-font-monospace;
src:
local('Roboto Mono'),
url('~fonts/roboto-mono/robotomono-regular-webfont.woff2') format('woff2'),
url('~fonts/roboto-mono/robotomono-regular-webfont.woff') format('woff'),
url('~fonts/roboto-mono/robotomono-regular-webfont.ttf') format('truetype'),
url('~fonts/roboto-mono/robotomono-regular-webfont.svg#roboto_monoregular')
url('@/fonts/roboto-mono/robotomono-regular-webfont.woff2') format('woff2'),
url('@/fonts/roboto-mono/robotomono-regular-webfont.woff') format('woff'),
url('@/fonts/roboto-mono/robotomono-regular-webfont.ttf') format('truetype'),
url('@/fonts/roboto-mono/robotomono-regular-webfont.svg#roboto_monoregular')
format('svg');
font-weight: 400;
font-display: swap;
app/javascript/styles/fonts/roboto.scss
+16 -16
View File
@@ -2,10 +2,10 @@
font-family: mastodon-font-sans-serif;
src:
local('Roboto Italic'),
url('~fonts/roboto/roboto-italic-webfont.woff2') format('woff2'),
url('~fonts/roboto/roboto-italic-webfont.woff') format('woff'),
url('~fonts/roboto/roboto-italic-webfont.ttf') format('truetype'),
url('~fonts/roboto/roboto-italic-webfont.svg#roboto-italic-webfont')
url('@/fonts/roboto/roboto-italic-webfont.woff2') format('woff2'),
url('@/fonts/roboto/roboto-italic-webfont.woff') format('woff'),
url('@/fonts/roboto/roboto-italic-webfont.ttf') format('truetype'),
url('@/fonts/roboto/roboto-italic-webfont.svg#roboto-italic-webfont')
format('svg');
font-weight: normal;
font-display: swap;
@@ -16,10 +16,10 @@
font-family: mastodon-font-sans-serif;
src:
local('Roboto Bold'),
url('~fonts/roboto/roboto-bold-webfont.woff2') format('woff2'),
url('~fonts/roboto/roboto-bold-webfont.woff') format('woff'),
url('~fonts/roboto/roboto-bold-webfont.ttf') format('truetype'),
url('~fonts/roboto/roboto-bold-webfont.svg#roboto-bold-webfont')
url('@/fonts/roboto/roboto-bold-webfont.woff2') format('woff2'),
url('@/fonts/roboto/roboto-bold-webfont.woff') format('woff'),
url('@/fonts/roboto/roboto-bold-webfont.ttf') format('truetype'),
url('@/fonts/roboto/roboto-bold-webfont.svg#roboto-bold-webfont')
format('svg');
font-weight: bold;
font-display: swap;
@@ -30,10 +30,10 @@
font-family: mastodon-font-sans-serif;
src:
local('Roboto Medium'),
url('~fonts/roboto/roboto-medium-webfont.woff2') format('woff2'),
url('~fonts/roboto/roboto-medium-webfont.woff') format('woff'),
url('~fonts/roboto/roboto-medium-webfont.ttf') format('truetype'),
url('~fonts/roboto/roboto-medium-webfont.svg#roboto-medium-webfont')
url('@/fonts/roboto/roboto-medium-webfont.woff2') format('woff2'),
url('@/fonts/roboto/roboto-medium-webfont.woff') format('woff'),
url('@/fonts/roboto/roboto-medium-webfont.ttf') format('truetype'),
url('@/fonts/roboto/roboto-medium-webfont.svg#roboto-medium-webfont')
format('svg');
font-weight: 500;
font-display: swap;
@@ -44,10 +44,10 @@
font-family: mastodon-font-sans-serif;
src:
local('Roboto'),
url('~fonts/roboto/roboto-regular-webfont.woff2') format('woff2'),
url('~fonts/roboto/roboto-regular-webfont.woff') format('woff'),
url('~fonts/roboto/roboto-regular-webfont.ttf') format('truetype'),
url('~fonts/roboto/roboto-regular-webfont.svg#roboto-regular-webfont')
url('@/fonts/roboto/roboto-regular-webfont.woff2') format('woff2'),
url('@/fonts/roboto/roboto-regular-webfont.woff') format('woff'),
url('@/fonts/roboto/roboto-regular-webfont.ttf') format('truetype'),
url('@/fonts/roboto/roboto-regular-webfont.svg#roboto-regular-webfont')
format('svg');
font-weight: normal;
font-display: swap;
app/javascript/styles/mastodon/admin.scss
+2 -2
View File
@@ -1446,8 +1446,8 @@ a.sparkline {
inset-inline-start: 10px;
border-radius: 4px;
background:
url('~images/warning-stripes.svg') repeat-y left,
url('~images/warning-stripes.svg') repeat-y right,
url('@/images/warning-stripes.svg') repeat-y left,
url('@/images/warning-stripes.svg') repeat-y right,
var(--background-color);
}
app/javascript/styles/mastodon/components.scss
+1 -1
View File
@@ -641,7 +641,7 @@ body > [data-popper-placement] {
align-items: stretch;
&__border {
background: url('~images/warning-stripes.svg') repeat-y;
background: url('@/images/warning-stripes.svg') repeat-y;
width: 5px;
flex: 0 0 auto;
app/javascript/styles/mastodon/forms.scss
+1 -1
View File
@@ -393,7 +393,7 @@ code {
max-width: 100%;
height: auto;
border-radius: var(--avatar-border-radius);
background: url('images/void.png');
background: url('@/images/void.png');
&[src$='missing.png'] {
visibility: hidden;
app/javascript/styles/mastodon/rich_text.scss
+1 -1
View File
@@ -44,7 +44,7 @@
content: '';
width: 24px;
height: 20px;
mask-image: url('~images/quote.svg');
mask-image: url('@/images/quote.svg');
background-color: var(--rich-text-decorations-color);
position: absolute;
inset-inline-start: 0;
app/javascript/styles/win95.scss
+52 -52
View File
@@ -1,7 +1,7 @@
// win95 theme from cybrespace.
// Modified by kibi! to use webpack package syntax for urls (eg,
// `url(~images/…)`) for easy importing into skins.
// `url(@/images/…)`) for easy importing into skins.
@use 'mastodon/functions' as *;
@@ -98,7 +98,7 @@ $win95-cyan: #008080;
@font-face {
font-family:"premillenium";
src: url('~fonts/premillenium/MSSansSerif.ttf') format('truetype');
src: url('@/fonts/premillenium/MSSansSerif.ttf') format('truetype');
}
/* borrowed from cybrespace style: wider columns and full column width images */
@@ -254,7 +254,7 @@ body.admin {
font-size:0px;
color:$win95-bg;
background-image: url("~images/start.png");
background-image: url("@/images/start.png");
background-repeat:no-repeat;
background-position:8%;
background-clip:padding-box;
@@ -276,7 +276,7 @@ body.admin {
left:15px;
width:132px;
height:117px;
background-image:url("~images/clippy_wave.gif"), url("~images/clippy_frame.png");
background-image:url("@/images/clippy_wave.gif"), url("@/images/clippy_frame.png");
background-repeat:no-repeat;
background-position: 4px 20px, 0px 0px;
z-index:0;
@@ -916,7 +916,7 @@ body.admin {
font-size:0px;
color:$win95-bg;
background-image: url("~images/start.png");
background-image: url("@/images/start.png");
background-repeat:no-repeat;
background-position:8%;
background-clip:padding-box;
@@ -1259,7 +1259,7 @@ body.admin {
}
.column-link__badge {
background-image: url('~images/alert_badge.png');
background-image: url('@/images/alert_badge.png');
background-repeat: no-repeat;
background-size:contain;
background-color:transparent;
@@ -1477,97 +1477,97 @@ body.admin {
}
.column-link[href="/web/timelines/home"] {
background-image: url("~images/icon_home.png");
&:hover { background-image: url("~images/icon_home.png"); }
background-image: url("@/images/icon_home.png");
&:hover { background-image: url("@/images/icon_home.png"); }
}
.column-link[href="/web/notifications"] {
background-image: url("~images/icon_notifications.png");
&:hover { background-image: url("~images/icon_notifications.png"); }
background-image: url("@/images/icon_notifications.png");
&:hover { background-image: url("@/images/icon_notifications.png"); }
}
.column-link[href="/web/timelines/public"] {
background-image: url("~images/icon_public.png");
&:hover { background-image: url("~images/icon_public.png"); }
background-image: url("@/images/icon_public.png");
&:hover { background-image: url("@/images/icon_public.png"); }
}
.column-link[href="/web/timelines/public/local"] {
background-image: url("~images/icon_local.png");
&:hover { background-image: url("~images/icon_local.png"); }
background-image: url("@/images/icon_local.png");
&:hover { background-image: url("@/images/icon_local.png"); }
}
.column-link[href="/web/timelines/direct"] {
background-image: url("~images/icon_direct.png");
&:hover { background-image: url("~images/icon_direct.png"); }
background-image: url("@/images/icon_direct.png");
&:hover { background-image: url("@/images/icon_direct.png"); }
}
.column-link[href="/web/pinned"] {
background-image: url("~images/icon_pin.png");
&:hover { background-image: url("~images/icon_pin.png"); }
background-image: url("@/images/icon_pin.png");
&:hover { background-image: url("@/images/icon_pin.png"); }
}
.column-link[href="/web/favourites"] {
background-image: url("~images/icon_likes.png");
&:hover { background-image: url("~images/icon_likes.png"); }
background-image: url("@/images/icon_likes.png");
&:hover { background-image: url("@/images/icon_likes.png"); }
}
.column-link[href="/web/lists"] {
background-image: url("~images/icon_lists.png");
&:hover { background-image: url("~images/icon_lists.png"); }
background-image: url("@/images/icon_lists.png");
&:hover { background-image: url("@/images/icon_lists.png"); }
}
.column-link[href="/web/follow_requests"] {
background-image: url("~images/icon_follow_requests.png");
&:hover { background-image: url("~images/icon_follow_requests.png"); }
background-image: url("@/images/icon_follow_requests.png");
&:hover { background-image: url("@/images/icon_follow_requests.png"); }
}
.column-link[href="/web/blocks"] {
background-image: url("~images/icon_blocks.png");
&:hover { background-image: url("~images/icon_blocks.png"); }
background-image: url("@/images/icon_blocks.png");
&:hover { background-image: url("@/images/icon_blocks.png"); }
}
.column-link[href="/web/domain_blocks"] {
background-image: url("~images/icon_domain_blocks.png");
&:hover { background-image: url("~images/icon_domain_blocks.png"); }
background-image: url("@/images/icon_domain_blocks.png");
&:hover { background-image: url("@/images/icon_domain_blocks.png"); }
}
.column-link[href="/web/mutes"] {
background-image: url("~images/icon_mutes.png");
&:hover { background-image: url("~images/icon_mutes.png"); }
background-image: url("@/images/icon_mutes.png");
&:hover { background-image: url("@/images/icon_mutes.png"); }
}
.column-link[href="/web/directory"] {
background-image: url("~images/icon_profile_directory.png");
&:hover { background-image: url("~images/icon_profile_directory.png"); }
background-image: url("@/images/icon_profile_directory.png");
&:hover { background-image: url("@/images/icon_profile_directory.png"); }
}
.column-link[href="/web/bookmarks"] {
background-image: url("~images/icon_bookmarks.png");
&:hover { background-image: url("~images/icon_bookmarks.png"); }
background-image: url("@/images/icon_bookmarks.png");
&:hover { background-image: url("@/images/icon_bookmarks.png"); }
}
.getting-started__footer ul li a[href="/web/keyboard-shortcuts"] {
background-image: url("~images/icon_keyboard_shortcuts.png");
&:hover { background-image: url("~images/icon_keyboard_shortcuts.png"); }
background-image: url("@/images/icon_keyboard_shortcuts.png");
&:hover { background-image: url("@/images/icon_keyboard_shortcuts.png"); }
}
.getting-started__footer ul li a[href="/invites"] {
background-image: url("~images/icon_invite.png");
&:hover { background-image: url("~images/icon_invite.png"); }
background-image: url("@/images/icon_invite.png");
&:hover { background-image: url("@/images/icon_invite.png"); }
}
.getting-started__footer ul li a[href="/terms"] {
background-image: url("~images/icon_tos.png");
&:hover { background-image: url("~images/icon_tos.png"); }
background-image: url("@/images/icon_tos.png");
&:hover { background-image: url("@/images/icon_tos.png"); }
}
.getting-started__footer ul li a[href="https://docs.joinmastodon.org"] {
background-image: url("~images/icon_docs.png");
&:hover { background-image: url("~images/icon_docs.png"); }
background-image: url("@/images/icon_docs.png");
&:hover { background-image: url("@/images/icon_docs.png"); }
}
.getting-started__footer ul li a[href="/about/more"] {
background-image: url("~images/icon_about.png");
&:hover { background-image: url("~images/icon_about.png"); }
background-image: url("@/images/icon_about.png");
&:hover { background-image: url("@/images/icon_about.png"); }
}
.getting-started__footer ul li a[href="/auth/sign_out"] {
background-image: url("~images/icon_logout.png");
&:hover { background-image: url("~images/icon_logout.png"); }
background-image: url("@/images/icon_logout.png");
&:hover { background-image: url("@/images/icon_logout.png"); }
}
.getting-started__footer ul li a[href="https://joinmastodon.org/apps"] {
background-image: url("~images/icon_mobile_apps.png");
&:hover { background-image: url("~images/icon_mobile_apps.png"); }
background-image: url("@/images/icon_mobile_apps.png");
&:hover { background-image: url("@/images/icon_mobile_apps.png"); }
}
.getting-started__footer ul li a[href="/settings/applications"] {
background-image: url("~images/icon_developers.png");
&:hover { background-image: url("~images/icon_developers.png"); }
background-image: url("@/images/icon_developers.png");
&:hover { background-image: url("@/images/icon_developers.png"); }
}
.getting-started__footer ul li a[href="/auth/edit"] {
background-image: url("~images/icon_settings.png");
&:hover { background-image: url("~images/icon_settings.png"); }
background-image: url("@/images/icon_settings.png");
&:hover { background-image: url("@/images/icon_settings.png"); }
}
.column .static-content.getting-started {