Merge branch 'main' into preview

taylorotwell · taylorotwell · commit 0c631afa8b09 · 2025-02-24T13:04:26.000-06:00
diff --git a/composer.json b/composer.json
@@ -71,6 +71,6 @@
             "php-http/discovery": true
         }
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true
 }
diff --git a/resources/css/app.css b/resources/css/app.css
@@ -4,7 +4,7 @@
 
 body,
 html {
-    --font-sans: 'Inter var', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+    --font-sans: 'Instrument Sans', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
 }
 
 @layer base {
diff --git a/resources/js/pages/settings/Profile.vue b/resources/js/pages/settings/Profile.vue
@@ -36,7 +36,9 @@ const form = useForm({
 });
 
 const submit = () => {
-    form.patch(route('profile.update'));
+    form.patch(route('profile.update'), {
+        preserveScroll: true,
+    });
 };
 </script>
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`body,`
`6`	`6`	`html {`
`7`		`- --font-sans: 'Inter var', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';`
	`7`	`+ --font-sans: 'Instrument Sans', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`@layer base {`