Skip to content

Commit

Permalink
[1.x] Update font and welcome page (#253)
Browse files Browse the repository at this point in the history
* Update font and welcome page

* Update text to match skeleton
  • Loading branch information
jessarcher authored Feb 14, 2023
1 parent d4756b6 commit 229a9c1
Show file tree
Hide file tree
Showing 8 changed files with 202 additions and 371 deletions.
3 changes: 2 additions & 1 deletion stubs/default/resources/views/layouts/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<title>{{ config('app.name', 'Laravel') }}</title>

<!-- Fonts -->
<link rel="stylesheet" href="https://fonts.bunny.net/css2?family=Nunito:wght@400;600;700&display=swap">
<link rel="preconnect" href="https://fonts.bunny.net">
<link href="https://fonts.bunny.net/css?family=figtree:400,500,600&display=swap" rel="stylesheet" />

<!-- Scripts -->
@vite(['resources/css/app.css', 'resources/js/app.js'])
Expand Down
3 changes: 2 additions & 1 deletion stubs/default/resources/views/layouts/guest.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<title>{{ config('app.name', 'Laravel') }}</title>

<!-- Fonts -->
<link rel="stylesheet" href="https://fonts.bunny.net/css2?family=Nunito:wght@400;600;700&display=swap">
<link rel="preconnect" href="https://fonts.bunny.net">
<link href="https://fonts.bunny.net/css?family=figtree:400,500,600&display=swap" rel="stylesheet" />

<!-- Scripts -->
@vite(['resources/css/app.css', 'resources/js/app.js'])
Expand Down
2 changes: 1 addition & 1 deletion stubs/default/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = {
theme: {
extend: {
fontFamily: {
sans: ['Nunito', ...defaultTheme.fontFamily.sans],
sans: ['Figtree', ...defaultTheme.fontFamily.sans],
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion stubs/inertia-common/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = {
theme: {
extend: {
fontFamily: {
sans: ['Nunito', ...defaultTheme.fontFamily.sans],
sans: ['Figtree', ...defaultTheme.fontFamily.sans],
},
},
},
Expand Down
287 changes: 91 additions & 196 deletions stubs/inertia-react/resources/js/Pages/Welcome.jsx

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion stubs/inertia-react/resources/views/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
<title inertia>{{ config('app.name', 'Laravel') }}</title>

<!-- Fonts -->
<link rel="stylesheet" href="https://fonts.bunny.net/css2?family=Nunito:wght@400;600;700&display=swap">
<link rel="preconnect" href="https://fonts.bunny.net">
<link href="https://fonts.bunny.net/css?family=figtree:400,500,600&display=swap" rel="stylesheet" />

<!-- Scripts -->
@routes
Expand Down
270 changes: 101 additions & 169 deletions stubs/inertia-vue/resources/js/Pages/Welcome.vue

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion stubs/inertia-vue/resources/views/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
<title inertia>{{ config('app.name', 'Laravel') }}</title>

<!-- Fonts -->
<link rel="stylesheet" href="https://fonts.bunny.net/css2?family=Nunito:wght@400;600;700&display=swap">
<link rel="preconnect" href="https://fonts.bunny.net">
<link href="https://fonts.bunny.net/css?family=figtree:400,500,600&display=swap" rel="stylesheet" />

<!-- Scripts -->
@routes
Expand Down

0 comments on commit 229a9c1

Please sign in to comment.