Skip to content

Commit 1f59f55

Browse files
committed
minor #1815 [Site] Some more cleaning (smnandre)
This PR was squashed before being merged into the 2.x branch. Discussion ---------- [Site] Some more cleaning Commits ------- b7101ce [Site] Some more cleaning
2 parents 1dad2e6 + b7101ce commit 1f59f55

File tree

25 files changed

+52
-217
lines changed

25 files changed

+52
-217
lines changed

ux.symfony.com/assets/styles/app.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@
6969
@import "components/Browser";
7070
@import "components/Changelog";
7171
@import "components/DataList";
72-
@import "components/demo-container";
72+
@import "components/DemoContainer";
7373
@import "components/DemoCard";
7474
@import "components/DocsLink";
75-
@import "components/file_tree";
75+
@import "components/FileTree";
7676
@import "components/Icon";
7777
@import "components/IconGrid";
7878
@import "components/IconModal";
@@ -93,7 +93,6 @@
9393
@import "utilities/background";
9494
@import "utilities/info-tooltips";
9595
@import "utilities/font";
96-
@import "utilities/rich-text";
9796
@import "utilities/shadow";
9897
@import "utilities/text";
9998

ux.symfony.com/assets/styles/app/_typography.scss

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
h1 {
33
font-size: 52px;
44
font-weight: 700;
5-
letter-spacing: -0.035em;
6-
}
7-
8-
h1.ubuntu {
95
line-height: 60px;
6+
letter-spacing: -0.035em;
7+
font-family: var(--font-family-title);
108
}
119

1210
h2.ubuntu {
@@ -77,7 +75,7 @@ h4.ubuntu {
7775

7876

7977
@media (max-width: 576px) {
80-
h1.ubuntu {
78+
h1 {
8179
font-size: 36px;
8280
line-height: 41px;
8381
letter-spacing: -1px;
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
.DemoContainer {
2+
background-color: var(--bs-body-bg);
3+
border: 1px solid var(--bs-secondary-bg-subtle);
4+
border-top-left-radius: 12px;
5+
border-top-right-radius: 12px;
6+
}
7+
8+
.DemoContainer-inner {
9+
background-color: var(--bs-secondary-bg);
10+
border: 1px solid var(--bs-secondary-bg-subtle);
11+
border-top: transparent;
12+
border-bottom-left-radius: 12px;
13+
border-bottom-right-radius: 12px;
14+
}
15+
16+
.demo-chat > .DemoContainer-inner {
17+
border-radius: 0;
18+
}

ux.symfony.com/assets/styles/components/_file_tree.scss renamed to ux.symfony.com/assets/styles/components/_FileTree.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
.file-tree ul {
1+
.FileTree ul {
22
display: flex;
33
flex-direction: column;
44
align-items: stretch;
55
justify-content: flex-start;
66
}
77

8-
.file-tree li > span {
8+
.FileTree li > span {
99
display: flex;
1010
flex-direction: row;
1111
gap: 1rem;
1212
}
1313

14-
.file-tree-main::before {
14+
.FileTree-main::before {
1515
background: none !important;
1616
}
1717

18-
.file-tree ul {
18+
.FileTree ul {
1919
position: relative;
2020
padding-inline-start: 1rem;
2121
}
2222

23-
.file-tree .tooltip-inner {
23+
.FileTree .tooltip-inner {
2424
max-width: 350px;
2525
}
2626

27-
.file-tree.nodots ul :not(span) {
27+
.FileTree.nodots ul :not(span) {
2828
margin-left: 12px;
2929
}
3030

31-
.file-tree ul::before {
31+
.FileTree ul::before {
3232
content: '';
3333
width: 1rem;
3434
background: url(../images/dot.svg) left top / 2px 2px;
3535
display: block;
3636
position: absolute;
3737
}
3838

39-
.file-tree ul::before {
39+
.FileTree ul::before {
4040
top: 0;
4141
height: 100%;
4242
background-repeat: repeat-y;

ux.symfony.com/assets/styles/components/_demo-container.scss

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

ux.symfony.com/assets/styles/utilities/_arrow.scss

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
.component-arrow {
2-
color: $n-200;
3-
}
4-
51
.arrow {
6-
background: url(../images/arrow.png);
72
width: 100%;
83
height: 36px;
4+
background: url(../images/arrow.png) no-repeat center;
95
background-size: contain;
10-
background-repeat: no-repeat;
11-
background-position: center;
126

137
[data-bs-theme="dark"] & {
148
filter: invert(100);
@@ -17,12 +11,10 @@
1711
}
1812

1913
.arrow-2 {
20-
background: url(../images/arrow-2.png);
14+
background: url(../images/arrow-2.png) no-repeat right;
15+
background-size: contain;
2116
width: 100%;
2217
height: 66px;
23-
background-size: contain;
24-
background-repeat: no-repeat;
25-
background-position: right;
2618

2719
[data-bs-theme="dark"] & {
2820
filter: invert(100);
Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
11
.ubuntu {
22
font-family: var(--font-family-title);
33
}
4-
5-
.font-title {
6-
font-family: var(--font-family-title);
7-
}
8-
9-
.font-text {
10-
font-family: var(--font-family-text);
11-
}
12-
13-
.font-code {
14-
font-family: var(--font-family-code);
15-
}

ux.symfony.com/assets/styles/utilities/_rich-text.scss

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

ux.symfony.com/config/packages/twig.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
twig:
22
default_path: '%kernel.project_dir%/templates'
33
form_themes: ['bootstrap_5_layout.html.twig']
4-
globals:
5-
twigPackageHelper: '@App\Service\TwigPackageHelper'
64

75
paths:
86
'%kernel.project_dir%/templates/demos/live_memory': ~

ux.symfony.com/src/Controller/UxPackage/TurboController.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use App\Form\AddTodoItemForm;
1616
use App\Form\AnimalCreationForm;
1717
use App\Repository\ChatRepository;
18-
use App\Service\PackageContext;
1918
use App\Service\UxPackageRepository;
2019
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
2120
use Symfony\Component\HttpFoundation\Request;
@@ -30,12 +29,10 @@ class TurboController extends AbstractController
3029
{
3130
#[Route('/turbo', name: 'app_turbo')]
3231
#[Route('/turbo/{name}/the/{animal}', name: 'app_turbo_with_animal')]
33-
public function __invoke(UxPackageRepository $packageRepository, ChatRepository $chatRepository, Request $request, PackageContext $packageContext, ?string $name = null, ?string $animal = null): Response
32+
public function __invoke(UxPackageRepository $packageRepository, ChatRepository $chatRepository, Request $request, ?string $name = null, ?string $animal = null): Response
3433
{
3534
$package = $packageRepository->find('turbo');
3635

37-
$packageContext->setCurrentPackage('turbo');
38-
3936
$form = $this->createForm(AnimalCreationForm::class);
4037
$form->handleRequest($request);
4138
if ($form->isSubmitted() && $form->isValid()) {

0 commit comments

Comments
 (0)