Skip to content

Commit 8078e50

Browse files
tabunatabuna
committed
Replace prism to LaravelSu/Highlight extension
1 parent faeb7ac commit 8078e50

File tree

12 files changed

+180
-54
lines changed

12 files changed

+180
-54
lines changed

‎public/build/assets/app-8jhtCGii.css

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎public/build/assets/app-CDEY8pR7.js renamed to ‎public/build/assets/app-DIW8daw-.js

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

‎public/build/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
"src": "public/img/ui/blockquote/warning.svg"
1717
},
1818
"resources/css/app.scss": {
19-
"file": "assets/app-8jhtCGii.css",
19+
"file": "assets/app-Bm2k39pO.css",
2020
"src": "resources/css/app.scss",
2121
"isEntry": true
2222
},
2323
"resources/js/app.js": {
24-
"file": "assets/app-CDEY8pR7.js",
24+
"file": "assets/app-DIW8daw-.js",
2525
"name": "app",
2626
"src": "resources/js/app.js",
2727
"isEntry": true,

‎public/vendor/orchid/js/orchid.js

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

‎resources/css/app.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ $utilities: (
109109
@import 'gagarin';
110110
@import 'slider';
111111
@import 'santa';
112+
@import "highlight";
112113

113114
.avatar {
114115
border-radius: 10em;

‎resources/css/docs.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,12 @@ main,
415415
display: none !important;
416416
}
417417
}
418+
419+
pre code {
420+
white-space: pre !important;
421+
overflow: hidden;
422+
}
423+
418424
}
419425

420426
.code-container {

‎resources/css/highlight.scss

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
pre {
2+
background-color: #171923;
3+
4+
code {
5+
padding: 1em 1.5em;
6+
overflow: auto;
7+
color: #ffffff !important;
8+
display: block;
9+
text-shadow: none;
10+
font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
11+
direction: ltr;
12+
text-align: left;
13+
white-space: pre;
14+
word-spacing: normal;
15+
word-break: normal;
16+
word-wrap: normal;
17+
line-height: 1.5;
18+
tab-size: 4;
19+
hyphens: none;
20+
-webkit-overflow-scrolling: touch;
21+
max-width: 100%;
22+
23+
.hl-attribute,
24+
.hl-template,
25+
.hl-value {
26+
color: #4bef96;
27+
}
28+
29+
.hl-constant,
30+
.hl-property,
31+
.hl-number {
32+
color: #b288ff;
33+
}
34+
35+
.hl-function {
36+
color: #f98f8c;
37+
}
38+
39+
.hl-slug,
40+
.hl-operator,
41+
.hl-tag2,
42+
.hl-keyword,
43+
.hl-property2,
44+
.hl-variable,
45+
.hl-value2 {
46+
color: #82d4f7;
47+
}
48+
49+
.hl-tag,
50+
.hl-type,
51+
.hl-literal {
52+
color: #ffd06b;
53+
}
54+
55+
.hl-delimeter,
56+
.hl-deletion {
57+
color: #d2cdea;
58+
}
59+
60+
.hl-generic,
61+
.hl-comment {
62+
color: #8781a2;
63+
}
64+
65+
.hl-blur {
66+
filter: blur(2px);
67+
}
68+
69+
.hl-strong {
70+
font-weight: bold;
71+
}
72+
73+
.hl-em {
74+
font-style: italic;
75+
}
76+
77+
.hl-deletion {
78+
min-width: 100%;
79+
background-color: #ff000033;
80+
}
81+
82+
.hl-addition {
83+
min-width: 100%;
84+
background-color: #2a4b3c;
85+
color: #4bef96;
86+
}
87+
88+
.hl-gutter {
89+
display: inline-block;
90+
font-size: 0.9em;
91+
color: #555;
92+
padding: 0 1ch;
93+
margin-right: 1ch;
94+
user-select: none;
95+
96+
&-addition {
97+
background-color: #34A853;
98+
color: #fff;
99+
}
100+
101+
&-deletion {
102+
background-color: #E94F4F;
103+
color: #fff;
104+
}
105+
}
106+
}
107+
}

‎resources/css/marketing.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,13 @@
2626
opacity: 0.5;
2727
}
2828
}
29+
30+
31+
.code-marketing-snipped {
32+
pre {
33+
margin: 0;
34+
code {
35+
overflow: hidden;
36+
}
37+
}
38+
}

‎resources/js/controllers/prism_controller.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ export default class extends Controller {
1313
Prism.manual = false;
1414

1515
[...this.element.querySelectorAll('pre code')].forEach((el) => {
16+
17+
if(el.classList.contains('notranslate')){
18+
return;
19+
}
20+
21+
1622
if (el.getAttribute('class') === null) {
1723
el.setAttribute('class', 'language-php');
1824
}

‎resources/views/library/clear-code.blade.php

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,36 @@
33
@section('description', 'Код должен быть понятен всем членам команды и легко читаем для разработчиков, которые могут внести изменения в него')
44
@section('content')
55

6-
<x-header align="align-items-end">
7-
<x-slot name="sup">Чистый код</x-slot>
8-
<x-slot name="title">Простые правила для вашего кода</x-slot>
9-
<x-slot name="description">
10-
Код должен быть понятен всем членам команды и легко читаем для разработчиков, которые могут внести изменения в него.
11-
</x-slot>
12-
<x-slot name="content">
13-
{{--
14-
<div class="col-6 mx-auto">
15-
<img src="/img/gusli.svg" class="img-fluid">
16-
</div>
17-
--}}
18-
<div class="position-relative" data-controller="prism">
19-
20-
<!-- Svg decoration -->
21-
{{--
22-
<figure class="position-absolute top-0 end-0 d-none d-md-block me-5">
23-
<x-icon path="l.dots" class="text-primary opacity-2" height="400" width="400" />
24-
</figure>
25-
--}}
26-
<pre class="rounded position-relative overflow-hidden bg-body p-4 text-white border border-dashed language-php" data-bs-theme="dark" tabindex="0" style="
27-
transform: rotate(350deg);"><code
28-
class="language-php">// Получаем инсайты трендов для маркетинговой кампании
6+
@php
7+
$markdownExampleCode = '
8+
```php
9+
// Получаем инсайты трендов для маркетинговой кампании
2910
$trendInsights = $this->getTrendInsights();
3011
3112
// Запускаем кампанию с полученными данными
3213
$campaignResults = $this->executeCampaign($trendInsights);
3314
3415
// Возвращаем результаты кампании
3516
return response()->json([
36-
'status' => Status::SUCCESS,
37-
'campaignResults' => $campaignResults
38-
]);</code></pre>
17+
\'status\' => Status::SUCCESS,
18+
\'campaignResults\' => $campaignResults
19+
]);
20+
```
21+
'
22+
@endphp
23+
24+
<x-header align="align-items-end">
25+
<x-slot name="sup">Чистый код</x-slot>
26+
<x-slot name="title">Простые правила для вашего кода</x-slot>
27+
<x-slot name="description">
28+
Код должен быть понятен всем членам команды и легко читаем для разработчиков, которые могут внести изменения в него.
29+
</x-slot>
30+
<x-slot name="content">
31+
<div class="position-relative">
32+
<div class="rounded position-relative overflow-hidden bg-body p-1 text-white border border-dashed code-marketing-snipped" style="
33+
transform: rotate(350deg);">
34+
<x-posts.content :content="$markdownExampleCode"/>
35+
</div>
3936
</div>
4037
</x-slot>
4138
</x-header>

‎resources/views/pages/welcome.blade.php

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -260,26 +260,14 @@ class="link-body-emphasis fw-semibold text-decoration-none icon-link icon-link-h
260260

261261

262262

263-
<x-header image="/img/ui/crane-h.svg">
264-
<x-slot:sup>Обучение</x-slot>
265-
<x-slot:title>
266-
Документация, гайды и видео
267-
</x-slot>
268-
269-
<x-slot:description>
270-
Каждый способ поможет плавно начать и освоить Laravel, шаг за шагом двигаясь к мастерству.
271-
</x-slot>
272-
273-
<x-slot name="content">
274-
<div data-controller="prism">
275-
<pre class="rounded position-relative overflow-hidden bg-body p-4 text-white border border-dashed language-php"
276-
data-bs-theme="dark" tabindex="0" style="
277-
transform: rotate(350deg);"><code
278-
class="language-php">Route::get('/user/{user}', function (User $user) {
263+
@php
264+
$markdownExampleRouteCode = '
265+
```php
266+
Route::get(\'/user/{user}\', function (User $user) {
279267
return $user;
280268
});
281269
282-
Route::post('/user', function (CreateUserRequest $request) {
270+
Route::post(\'/user\', function (CreateUserRequest $request) {
283271
$user = User::create($request->validated());
284272
285273
// Поздравьте по электронной почте.
@@ -288,7 +276,23 @@ class="language-php">Route::get('/user/{user}', function (User $user) {
288276
// Мгновенный ответ с информацией о созданном пользователе.
289277
return $user;
290278
});
291-
</code></pre>
279+
```
280+
'
281+
@endphp
282+
283+
<x-header image="/img/ui/crane-h.svg">
284+
<x-slot:sup>Обучение</x-slot>
285+
<x-slot:title>
286+
Документация, гайды и видео
287+
</x-slot>
288+
289+
<x-slot:description>
290+
Каждый способ поможет плавно начать и освоить Laravel, шаг за шагом двигаясь к мастерству.
291+
</x-slot>
292+
293+
<x-slot name="content">
294+
<div class="rounded position-relative overflow-hidden bg-body p-1 text-white border border-dashed code-marketing-snipped" style="transform: rotate(350deg);">
295+
<x-posts.content :content="$markdownExampleRouteCode"/>
292296
</div>
293297
</x-slot>
294298

‎resources/views/pastebin/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<form action="{{ route('pastebin.store') }}" method="post">
1111
<div data-controller="prism" class="rounded overflow-hidden">
1212
<pre contenteditable="true"
13-
class="rounded line-numbers border"
13+
class="rounded line-numbers border p-0 m-0"
1414
style="min-height: 600px;"
1515
data-action="input->prism#paste keydown->prism#keydownPaste"
1616
data-prism-target="editable"><code id="yaml"

0 commit comments

Comments
 (0)