Skip to content

Commit 512f59c

Browse files
mckenzieartsmckenziearts
authored
Merge pull request #60 from laravelcm/update-fonts
Update fonts
2 parents 1285d71 + 41c4efa commit 512f59c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+246
-131
lines changed

‎composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"sentry/sentry-laravel": "^2.10",
3232
"socialiteproviders/twitter": "^4.1",
3333
"spatie/laravel-feed": "^4.1",
34+
"spatie/laravel-google-fonts": "^1.2",
3435
"spatie/laravel-health": "^1.11",
3536
"spatie/laravel-medialibrary": "^9.0.0",
3637
"spatie/laravel-permission": "^5.1",

‎composer.lock

Lines changed: 81 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/google-fonts.php

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?php
2+
3+
return [
4+
5+
/*
6+
* Here you can register fonts to call from the @googlefonts Blade directive.
7+
* The google-fonts:fetch command will prefetch these fonts.
8+
*/
9+
'fonts' => [
10+
'default' => 'https://fonts.googleapis.com/css2?family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700&family=Lexend:wght@700&family=JetBrains+Mono',
11+
],
12+
13+
/*
14+
* This disk will be used to store local Google Fonts. The public disk
15+
* is the default because it can be served over HTTP with storage:link.
16+
*/
17+
'disk' => 'public',
18+
19+
/*
20+
* Prepend all files that are written to the selected disk with this path.
21+
* This allows separating the fonts from other data in the public disk.
22+
*/
23+
'path' => 'fonts',
24+
25+
/*
26+
* By default, CSS will be inlined to reduce the amount of round trips
27+
* browsers need to make in order to load the requested font files.
28+
*/
29+
'inline' => true,
30+
31+
/*
32+
* When something goes wrong fonts are loaded directly from Google.
33+
* With fallback disabled, this package will throw an exception.
34+
*/
35+
'fallback' => ! env('APP_DEBUG'),
36+
37+
/*
38+
* This user agent will be used to request the stylesheet from Google Fonts.
39+
* This is the Safari 14 user agent that only targets modern browsers. If
40+
* you want to target older browsers, use different user agent string.
41+
*/
42+
'user_agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.3 Safari/605.1.15',
43+
44+
];

‎config/markdown.php

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
* For the full copyright and license information, please view the LICENSE
1111
* file that was distributed with this source code.
1212
*/
13-
use League\CommonMark\Extension\Attributes\AttributesExtension;
1413
use League\CommonMark\Extension\HeadingPermalink\HeadingPermalinkExtension;
1514
use League\CommonMark\Extension\Mention\MentionExtension;
1615
use Torchlight\Commonmark\V2\TorchlightExtension;
@@ -53,10 +52,24 @@
5352
League\CommonMark\Extension\Table\TableExtension::class,
5453
HeadingPermalinkExtension::class,
5554
MentionExtension::class,
56-
AttributesExtension::class,
5755
TorchlightExtension::class,
5856
],
5957

58+
'heading_permalink' => [
59+
'html_class' => 'anchor mr-2 !text-skin-primary !no-underline hover:!text-skin-primary-hover focus:!text-skin-primary-hover focus:outline-none',
60+
'fragment_prefix' => '',
61+
'id_prefix' => '',
62+
'symbol' => '#',
63+
],
64+
65+
'mentions' => [
66+
'username' => [
67+
'prefix' => '@',
68+
'pattern' => '[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}(?!\w)',
69+
'generator' => config('app.url').'/user/%s',
70+
],
71+
],
72+
6073
/*
6174
|--------------------------------------------------------------------------
6275
| Renderer Configuration
@@ -78,20 +91,6 @@
7891
'soft_break' => "\n",
7992
],
8093

81-
'heading_permalink' => [
82-
'html_class' => 'anchor !text-skin-primary !no-underline hover:!text-skin-primary-hover focus:!text-skin-primary-hover focus:outline-none',
83-
'symbol' => '',
84-
'aria_hidden' => true,
85-
],
86-
87-
'mentions' => [
88-
'username' => [
89-
'prefix' => '@',
90-
'pattern' => '[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}(?!\w)',
91-
'generator' => config('app.url').'/user/%s',
92-
],
93-
],
94-
9594
/*
9695
|--------------------------------------------------------------------------
9796
| Commonmark Configuration
@@ -128,7 +127,7 @@
128127
|
129128
*/
130129

131-
'html_input' => 'strip',
130+
'html_input' => 'allow',
132131

133132
/*
134133
|--------------------------------------------------------------------------

‎config/torchlight.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
// We replace tabs in your code blocks with spaces in HTML. Set
2323
// the number of spaces you'd like to use per tab. Set to
2424
// `false` to leave literal tabs in the HTML.
25-
'tab_width' => 2,
25+
'tab_width' => 4,
2626

2727
// Global options to control blocks-level settings.
2828
// https://torchlight.dev/docs/options

‎public/css/app.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/mix-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"/js/app.js": "/js/app.js?id=3bd7a17ae8879cea08888521628605ff",
3-
"/css/app.css": "/css/app.css?id=e5333661248309db13cc47adc52e25de"
3+
"/css/app.css": "/css/app.css?id=965b827a53b8849b3917cf5832b0d9a8"
44
}

‎resources/css/app.css

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,13 @@
104104
}
105105
}
106106

107-
html {
108-
scroll-behavior: smooth;
107+
[x-cloak] {
108+
display: none !important;
109109
}
110110

111-
[x-cloak] { display: none !important; }
111+
.prose iframe {
112+
@apply w-full;
113+
}
112114

113115
.logo-dark {
114116
display: none;

‎resources/css/torchlight.css

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
overflow-x-auto is recommended.
44
*/
55
pre {
6-
@apply my-4 rounded overflow-x-auto font-mono text-lg;
6+
@apply my-4 rounded overflow-x-auto;
77
padding: 0 !important;
88
}
99

@@ -14,16 +14,14 @@ pre {
1414
colors extend edge to edge.
1515
*/
1616
pre code.torchlight {
17-
@apply block p-4 min-w-max font-mono;
18-
padding-top: 1rem !important;
19-
padding-bottom: 1rem !important;
17+
@apply block py-4 min-w-max;
2018
}
2119

2220
/*
2321
Horizontal line padding.
2422
*/
2523
pre code.torchlight .line {
26-
@apply px-4 font-normal;
24+
@apply px-4;
2725
}
2826

2927
/*
@@ -33,6 +31,7 @@ pre code.torchlight .line {
3331
pre code.torchlight .line-number,
3432
pre code.torchlight .summary-caret {
3533
@apply mr-4;
34+
user-select: none;
3635
}
3736

3837
.torchlight.has-focus-lines .line:not(.line-focus) {

‎resources/views/about.blade.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,23 @@
2727
<dt class="order-2 mt-2 text-lg leading-6 font-medium text-green-900">
2828
Membres sur Slack
2929
</dt>
30-
<dd class="order-1 text-5xl font-extrabold text-green-600 font-sans">
30+
<dd class="order-1 text-5xl font-extrabold text-green-600 font-heading">
3131
+300
3232
</dd>
3333
</div>
3434
<div class="flex flex-col p-6 text-center sm:p-10">
3535
<dt class="order-2 mt-2 text-lg leading-6 font-medium text-green-900">
3636
Membres sur Telegram
3737
</dt>
38-
<dd class="order-1 text-5xl font-extrabold text-green-600 font-sans">
38+
<dd class="order-1 text-5xl font-extrabold text-green-600 font-heading">
3939
+100
4040
</dd>
4141
</div>
4242
<div class="flex flex-col p-6 text-center sm:p-10">
4343
<dt class="order-2 mt-2 text-lg leading-6 font-medium text-green-900">
4444
Membres sur WhatsApp
4545
</dt>
46-
<dd class="order-1 text-5xl font-extrabold text-green-600 font-sans">
46+
<dd class="order-1 text-5xl font-extrabold text-green-600 font-heading">
4747
+250
4848
</dd>
4949
</div>
@@ -53,7 +53,7 @@
5353
<div class="py-8 sm:py-10 lg:py-12">
5454
<h1 class="font-sans text-skin-inverted">
5555
<span class="block text-sm font-semibold text-skin-primary sm:text-base lg:text-sm xl:text-base">Notre histoire</span>
56-
<span class="mt-1 block text-xl tracking-tight font-extrabold sm:text-2xl xl:text-3xl">
56+
<span class="mt-1 block text-xl tracking-tight font-extrabold font-heading sm:text-2xl xl:text-3xl">
5757
Nous commençons tout juste
5858
</span>
5959
</h1>
@@ -96,8 +96,8 @@
9696
<div class="space-y-12 lg:grid lg:grid-cols-3 lg:gap-24 lg:space-y-0">
9797
<div class="font-sans">
9898
<span class="text-sm leading-5 text-skin-primary font-semibold tracking-wide uppercase">Notre équipe</span>
99-
<h2 class="mt-2 text-2xl font-extrabold text-skin-inverted tracking-tight sm:text-3xl">Équipe de direction</h2>
100-
<p class="mt-5 text-lg text-skin-base font-mono font-normal">Laravel Cameroun est une idée qui a été initiée puis transformée en une communauté par 2 développeurs parmi les plus influents au Cameroun.</p>
99+
<h2 class="mt-2 text-2xl font-extrabold font-heading text-skin-inverted tracking-tight sm:text-3xl">Équipe de direction</h2>
100+
<p class="mt-5 text-lg text-skin-base">Laravel Cameroun est une idée qui a été initiée puis transformée en une communauté par 2 développeurs parmi les plus influents au Cameroun.</p>
101101
</div>
102102
<div class="lg:col-span-2">
103103
<ul role="list" class="space-y-12 sm:grid sm:grid-cols-2 sm:gap-x-6 sm:gap-y-12 sm:space-y-0 lg:gap-x-8">

‎resources/views/articles/show.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<div class="hidden relative lg:block lg:col-span-2">
1515
<div class="divide-y divide-skin-base sticky space-y-6 top-4">
1616
<div>
17-
<h4 class="text-xs text-skin-base font-medium leading-4 tracking-wide uppercase">A propos de l’auteur</h4>
17+
<h4 class="text-xs text-skin-base font-medium leading-4 tracking-wide uppercase font-heading">A propos de l’auteur</h4>
1818
<div class="mt-6 space-y-4">
1919
<a href="{{ route('profile', $author->username) }}" class="shrink-0 block">
2020
<div class="flex items-center">
@@ -110,7 +110,7 @@
110110
<span>{{ $article->readTime() }} min de lecture</span>
111111
</div>
112112
</div>
113-
<h1 class="text-2xl font-extrabold text-skin-inverted tracking-tight font-sans sm:text-3xl sm:leading-10 md:text-4xl lg:text-5xl lg:leading-[3.5rem]">{{ $article->title }}</h1>
113+
<h1 class="text-2xl font-extrabold text-skin-inverted tracking-tight font-heading sm:text-3xl sm:leading-10 md:text-4xl lg:text-5xl lg:leading-[3.5rem]">{{ $article->title }}</h1>
114114
<a href="{{ route('profile', $article->author->username) }}" class="mt-3 shrink-0 group block lg:hidden">
115115
<div class="flex items-center">
116116
<div>
@@ -147,7 +147,7 @@ class="mt-8 prose prose-lg prose-green text-skin-base mx-auto md:prose-xl lg:max
147147
<p class="text-sm font-medium text-skin-inverted">
148148
{{ $author->name }}
149149
</p>
150-
<p class="text-xs font-medium text-skin-muted font-mono">
150+
<p class="text-xs font-medium text-skin-muted">
151151
{{ '@' . $author->username }}
152152
</p>
153153
</div>

‎resources/views/auth/forgot-password.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<div>
1010
<x-status-message class="mb-5" />
1111

12-
<h2 class="text-center text-3xl font-extrabold text-skin-inverted font-sans sm:text-left font-mono">
12+
<h2 class="text-center text-3xl font-extrabold text-skin-inverted font-sans sm:text-left font-heading">
1313
{{ __('Réinitialisation du mot de passe') }}
1414
</h2>
15-
<div class="mt-4 text-sm text-skin-base font-normal">
15+
<div class="mt-4 text-sm text-skin-base">
1616
{{ __('Mot de passe oublié? Aucun problème. Communiquez-nous simplement votre adresse e-mail et nous vous enverrons par e-mail un lien de réinitialisation de mot de passe qui vous permettra d\'en choisir un nouveau.') }}
1717
</div>
1818
</div>

‎resources/views/auth/login.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="flex items-center justify-center min-h-full py-16 sm:py-24">
88
<div class="max-w-md w-full space-y-8">
99
<div>
10-
<h2 class="text-center text-3xl font-extrabold text-skin-inverted font-mono">
10+
<h2 class="text-center text-3xl font-extrabold text-skin-inverted font-heading">
1111
{{ __('Se connecter à son compte') }}
1212
</h2>
1313
</div>

‎resources/views/auth/register.blade.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,15 @@
5858
</div>
5959
<div class="mx-auto max-w-md lg:mx-0 space-y-8">
6060
<div class="space-y-3">
61-
<h2 class="text-center text-3xl font-extrabold text-skin-inverted font-mono">
61+
<h2 class="text-3xl font-extrabold text-skin-inverted font-heading">
6262
{{ __('Rejoindre Laravel Cameroun') }}
6363
</h2>
6464
<x-profile-users />
65-
<p class="text-center text-sm text-skin-base font-normal">
65+
<p class="text-base leading-6 text-skin-base">
6666
{{ __("Rejoignez plus de 200 développeurs et designers. Parce qu’il y’a pas que le code dans la vie.") }}
6767
</p>
6868
</div>
6969
<div>
70-
7170
<x-status-message />
7271

7372
<form class="space-y-6" action="{{ route('register') }}" method="POST">

0 commit comments

Comments
 (0)